diff --git a/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml b/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
index 5fadf57..336d0a1 100644
--- a/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
+++ b/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
@@ -222,10 +222,15 @@
 
    <requires>
       <import plugin="org.junit4" version="4.8.1" match="compatible"/>
-      <import plugin="org.eclipse.emf.emfstore.client"/>
       <import plugin="org.eclipse.emf.emfstore.modelmutator"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore.edit" version="2.5.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.edit"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.emf.edit.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.emf.emfstore.fuzzy.test.feature/.project b/org.eclipse.emf.emfstore.fuzzy.test.feature/.project
new file mode 100644
index 0000000..ea145f8
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.test.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.emfstore.fuzzy.test.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.emf.emfstore.fuzzy.test.feature/build.properties b/org.eclipse.emf.emfstore.fuzzy.test.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.test.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml b/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
new file mode 100644
index 0000000..a76d287
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.emf.emfstore.fuzzy.test.feature"
+      label="EMFStore Fuzzy Tests (Incubation)"
+      version="0.9.3.qualifier"
+      provider-name="Eclipse Modeling Project">
+
+   <description url="http://www.example.com/description">
+      This feature contains the integration plugins for EMFStore with fuzzy testing.
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.emf.emfstore.fuzzy.emf"/>
+      <import plugin="org.eclipse.emf.emfstore.client.test"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.emf.emfstore.fuzzy.emf.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml b/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
index c4687f1..29e1434 100644
--- a/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
+++ b/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.emfstore.migration.edapt.feature"
       label="EMFStore Edapt Migration (Incubation)"
-      version="0.8.9.qualifier"
+      version="0.9.3.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description url="http://emfstore.org">