diff --git a/de.prob.core.tests/.classpath b/de.prob.core.tests/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..396533344bbc5e009e1e5b52e3264c4be92efb17
--- /dev/null
+++ b/de.prob.core.tests/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/de.prob.core.tests/.project b/de.prob.core.tests/.project
new file mode 100644
index 0000000000000000000000000000000000000000..d35196a0d758c01def2ade464d2ae32be3d75326
--- /dev/null
+++ b/de.prob.core.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>de.prob.core.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/de.prob.core.tests/.settings/org.eclipse.jdt.core.prefs b/de.prob.core.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..c537b63063ce6052bdc49c5fd0745b078f162c90
--- /dev/null
+++ b/de.prob.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/de.prob.core.tests/META-INF/MANIFEST.MF b/de.prob.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..48c8af92e80d72d2f92ee77f4e39571ac9caa7de
--- /dev/null
+++ b/de.prob.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: de.prob.core.tests
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: de.prob.core
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit;bundle-version="4.8.2"
diff --git a/de.prob.core.tests/build.properties b/de.prob.core.tests/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..34d2e4d2dad529ceaeb953bfcdb63c51d69ffed2
--- /dev/null
+++ b/de.prob.core.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleAllUnitTests.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleAllUnitTests.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleAllUnitTests.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleAllUnitTests.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleAndUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleAndUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleAndUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleAndUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleFinallyUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleFinallyUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleFinallyUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleFinallyUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleGloballyUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleGloballyUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleGloballyUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleGloballyUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleHistoryUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleHistoryUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleHistoryUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleHistoryUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleImplyUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleImplyUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleImplyUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleImplyUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleNextUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleNextUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleNextUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleNextUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleNotUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleNotUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleNotUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleNotUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleOnceUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleOnceUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleOnceUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleOnceUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleOrUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleOrUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleOrUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleOrUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleReleaseUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleReleaseUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleReleaseUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleReleaseUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleSinceUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleSinceUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleSinceUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleSinceUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleTriggerUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleTriggerUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleTriggerUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleTriggerUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleUntilUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleUntilUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleUntilUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleUntilUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleWeakUntilUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleWeakUntilUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleWeakUntilUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleWeakUntilUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleYesterdayUnitTest.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleYesterdayUnitTest.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/CounterExampleYesterdayUnitTest.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleYesterdayUnitTest.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/LtlTestDescription.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/LtlTestDescription.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/LtlTestDescription.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/LtlTestDescription.java
diff --git a/de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/TestCounterExample.java b/de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/TestCounterExample.java
similarity index 100%
rename from de.prob.core/test/de/prob/core/domainobjects/ltl/unittests/TestCounterExample.java
rename to de.prob.core.tests/src/de/prob/core/domainobjects/ltl/unittests/TestCounterExample.java
diff --git a/de.prob.core/.classpath b/de.prob.core/.classpath
index f469a1446bc01801b9d7033478bd396dfa04b812..20b6dff1d1593c5d4669f63256e764b3d86be7fa 100644
--- a/de.prob.core/.classpath
+++ b/de.prob.core/.classpath
@@ -4,8 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="bin"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.4.12-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.4.12-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/cliparser-2.4.12-SNAPSHOT.jar"/>
@@ -20,4 +18,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xpp3_min-1.1.4c.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.3.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/settings.gradle b/settings.gradle
index b488c61bc8301f8a4a686f9ad23d2b6109f7d62a..2999825e4166d18ddb81985fd572577f4c160833 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 
-include 'de.prob.core', 'de.bmotionstudio.gef.editor' ,'de.bmotionstudio.rodin', 'de.bmotionstudio.help' , 'de.prob.plugin', 'de.prob.ui', 'de.prob2.feature', 'de.prob.units', 'de.prob2.units.feature'
+include 'de.prob.core', 'de.prob.core.tests', 'de.bmotionstudio.gef.editor' ,'de.bmotionstudio.rodin', 'de.bmotionstudio.help' , 'de.prob.plugin', 'de.prob.ui', 'de.prob2.feature', 'de.prob.units', 'de.prob2.units.feature'