diff --git a/org.lflang.cli/test/kotlin/org/lflang/cli/tests/LfcIssueReportingTest.kt b/org.lflang.tests/src/org/lflang/tests/cli/LfcIssueReportingTest.kt
similarity index 96%
rename from org.lflang.cli/test/kotlin/org/lflang/cli/tests/LfcIssueReportingTest.kt
rename to org.lflang.tests/src/org/lflang/tests/cli/LfcIssueReportingTest.kt
index 12519a1ca0..683e220c7f 100644
--- a/org.lflang.cli/test/kotlin/org/lflang/cli/tests/LfcIssueReportingTest.kt
+++ b/org.lflang.tests/src/org/lflang/tests/cli/LfcIssueReportingTest.kt
@@ -21,7 +21,7 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lflang.cli.tests
+package org.lflang.tests.cli
 
 import junit.framework.Assert.assertEquals
 import junit.framework.AssertionFailedError
@@ -118,8 +118,8 @@ class LfcIssueReportingTest {
 
         val packageName = loader.packageName.replace('.', '/')
         // relative to root of gradle project
-        val lfFile = Paths.get("test/resources/$packageName/$fileBaseName.lf")
-        val expectedPath = Paths.get("test/resources/$packageName/$fileBaseName.stderr")
+        val lfFile = Paths.get("src/resources/$packageName/$fileBaseName.lf")
+        val expectedPath = Paths.get("src/resources/$packageName/$fileBaseName.stderr")
 
         assert(Files.exists(lfFile)) { "Missing test file $lfFile" }
 
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/colors.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/colors.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/colors.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/colors.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/colors.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/colors.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/colors.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/colors.stderr
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/emptyFile.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/emptyFile.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/emptyFile.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/emptyFile.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/emptyFile.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/emptyFile.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/emptyFile.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/emptyFile.stderr
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/issue490.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/issue490.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/issue490.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/issue490.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/issue490.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/issue490.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/issue490.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/issue490.stderr
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarning.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarning.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarning.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarning.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarning.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarning.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarning.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarning.stderr
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarningTooBig.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarningTooBig.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarningTooBig.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarningTooBig.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarningTooBig.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarningTooBig.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/multilineWarningTooBig.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/multilineWarningTooBig.stderr
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/simpleWarning.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/simpleWarning.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/simpleWarning.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/simpleWarning.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/simpleWarning.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/simpleWarning.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/simpleWarning.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/simpleWarning.stderr
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/tabs.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/tabs.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/tabs.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/tabs.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/tabs.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/tabs.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/tabs.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/tabs.stderr
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/twoLineWarning.lf b/org.lflang.tests/src/resources/org/lflang/cli/tests/twoLineWarning.lf
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/twoLineWarning.lf
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/twoLineWarning.lf
diff --git a/org.lflang.cli/test/resources/org/lflang/cli/tests/twoLineWarning.stderr b/org.lflang.tests/src/resources/org/lflang/cli/tests/twoLineWarning.stderr
similarity index 100%
rename from org.lflang.cli/test/resources/org/lflang/cli/tests/twoLineWarning.stderr
rename to org.lflang.tests/src/resources/org/lflang/cli/tests/twoLineWarning.stderr