diff --git a/utils/umc_dev/org.wesnoth.tests/.classpath b/utils/umc_dev/org.wesnoth.tests/.classpath
new file mode 100644
index 00000000000..ad32c83a788
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth.tests/.classpath
@@ -0,0 +1,7 @@
+<?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="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/utils/umc_dev/org.wesnoth.tests/.project b/utils/umc_dev/org.wesnoth.tests/.project
new file mode 100644
index 00000000000..11d66941cd2
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.wesnoth.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/utils/umc_dev/org.wesnoth.tests/.settings/org.eclipse.jdt.core.prefs b/utils/umc_dev/org.wesnoth.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..8afabeb8cde
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Wed Aug 03 11:06:19 EEST 2011
+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/utils/umc_dev/org.wesnoth.tests/META-INF/MANIFEST.MF b/utils/umc_dev/org.wesnoth.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..2eb3502d5fe
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Wesnoth UMC Dev tests
+Bundle-SymbolicName: org.wesnoth.tests
+Bundle-Version: 1.0.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.wesnoth;bundle-version="1.0.3",
+ org.wesnoth.ui;bundle-version="1.0.3",
+ org.eclipse.xtext.junit;bundle-version="2.0.0",
+ org.eclipse.xtext;bundle-version="2.0.0"
+Export-Package: org.wesnoth.tests
diff --git a/utils/umc_dev/org.wesnoth.tests/build.properties b/utils/umc_dev/org.wesnoth.tests/build.properties
new file mode 100644
index 00000000000..41eb6ade2b4
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/WMLTests.java b/utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/WMLTests.java
similarity index 100%
rename from utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/WMLTests.java
rename to utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/WMLTests.java
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/WMLTestsSuite.java b/utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/WMLTestsSuite.java
similarity index 100%
rename from utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/WMLTestsSuite.java
rename to utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/WMLTestsSuite.java
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/grammar/WMLFilesTests.java b/utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/grammar/WMLFilesTests.java
similarity index 100%
rename from utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/grammar/WMLFilesTests.java
rename to utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/grammar/WMLFilesTests.java
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/grammar/WMLGrammarTokensTests.java b/utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/grammar/WMLGrammarTokensTests.java
similarity index 100%
rename from utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/grammar/WMLGrammarTokensTests.java
rename to utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/grammar/WMLGrammarTokensTests.java
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/plugin/WMLParsingCampaignsConfigs.java b/utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/plugin/WMLParsingCampaignsConfigs.java
similarity index 100%
rename from utils/umc_dev/org.wesnoth/src/org/wesnoth/tests/plugin/WMLParsingCampaignsConfigs.java
rename to utils/umc_dev/org.wesnoth.tests/src/org/wesnoth/tests/plugin/WMLParsingCampaignsConfigs.java
diff --git a/utils/umc_dev/org.wesnoth/META-INF/MANIFEST.MF b/utils/umc_dev/org.wesnoth/META-INF/MANIFEST.MF
index 892a5a940e3..259a74e583d 100644
--- a/utils/umc_dev/org.wesnoth/META-INF/MANIFEST.MF
+++ b/utils/umc_dev/org.wesnoth/META-INF/MANIFEST.MF
@@ -36,7 +36,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.generator;bundle-version="2.0.0";resolution:=optional,
  org.eclipse.xtext.ui;bundle-version="2.0.0",
  org.eclipse.xtext.util;bundle-version="2.0.0",
- org.eclipse.xtext.junit;bundle-version="2.0.0",
  org.eclipse.jface.text;bundle-version="3.3.0",
  org.eclipse.help;bundle-version="3.5.0",
  org.eclipse.help.ui;bundle-version="3.5.3",
@@ -65,7 +64,6 @@ Export-Package: org.wesnoth,
  org.wesnoth.scoping,
  org.wesnoth.services,
  org.wesnoth.templates,
- org.wesnoth.tests,
  org.wesnoth.utils,
  org.wesnoth.validation,
  org.wesnoth.wizards,