diff --git a/samples/pom.xml b/samples/pom.xml
index 4d5856ee0b..bfcb5158a4 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -689,7 +689,7 @@
         <module>ariestrader</module>
         <module>blog</module>
         <module>blueprint</module>
-<!--        <module>twitter</module>-->
+        <module>twitter</module>
     </modules>
 
 </project>
diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml
index 0ef404f5da..9045a0df32 100644
--- a/samples/twitter/twitter-itests/pom.xml
+++ b/samples/twitter/twitter-itests/pom.xml
@@ -35,13 +35,16 @@
     <properties>
         <asm.version>4.0</asm.version>
         <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
-        <exam.version>3.4.0</exam.version>
+        <exam.version>4.13.5</exam.version>
+        <javax.inject.version>1</javax.inject.version>
         <logback.version>0.9.29</logback.version>
+        <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
+        <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
         <swissbox.version>1.7.0</swissbox.version>
         <tinybundles.version>2.0.0</tinybundles.version>
-        <url.version>1.6.0</url.version>
+        <url.version>2.6.16</url.version>
     </properties>
 
     <dependencies>
@@ -86,12 +89,20 @@
             <artifactId>org.apache.aries.application.utils</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--        TODO ARIES-2165 Use testsupport dependency when application runs on newer eclipse -->
+        <!--
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <version>${org.apache.aries.testsupport.unit.version}</version>
             <scope>test</scope>
         </dependency>
+        -->
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${javax.inject.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.aries.application</groupId>
diff --git a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/itest b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/itest
new file mode 120000
index 0000000000..5e145ea8ae
--- /dev/null
+++ b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/itest
@@ -0,0 +1 @@
+../../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/itest
\ No newline at end of file
diff --git a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
index 97b9bfef14..0f7711bad8 100644
--- a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
+++ b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
@@ -168,7 +168,7 @@ protected Option baseOptions() {
 				junitBundles(),
 				mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
 				mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"),
-				mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+				//mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 				// this is how you set the default log level when using pax
 				// logging (logProfile)
 				systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),