diff --git a/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java b/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java
index 510b2974b6f..9b572bbd2cb 100644
--- a/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java
+++ b/core/org.eclipse.cdt.alltests/src/org/eclipse/cdt/alltests/AllTests.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.alltests;
 
+import junit.framework.JUnit4TestAdapter;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -22,7 +23,7 @@ import junit.framework.TestSuite;
 public class AllTests extends TestSuite {
 	public static Test suite() throws Exception {
 		final AllTests suite = new AllTests();
-		suite.addTest(org.eclipse.cdt.autotools.tests.AllAutotoolsTests.suite());
+		suite.addTest(new JUnit4TestAdapter(org.eclipse.cdt.autotools.tests.AllAutotoolsTests.class));
 		//	// There are intermittent failures in these tests. No pattern to failures. Seems like indexer is interrupted  
 		if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$
 			suite.addTest(org.eclipse.cdt.codan.core.test.AutomatedIntegrationSuite.suite());