diff --git a/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF
index c23c6f03010..2db3870a0e4 100644
--- a/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF
@@ -20,5 +20,4 @@ Bundle-ActivationPolicy: lazy
 Fragment-Host: org.eclipse.cdt.autotools.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.cdt.autotools.tests,
- org.eclipse.cdt.autotools.tests.autoconf,
  org.eclipse.cdt.autotools.tests.editors
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java
index 594217df747..1ae9154c3a2 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.autotools.tests;
 
-import org.eclipse.cdt.autotools.tests.autoconf.AutoconfTests;
 import org.eclipse.cdt.autotools.tests.editors.EditorTests;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -26,7 +25,6 @@ import org.junit.runners.Suite;
 	AutotoolsEnvironmentVarTest.class,
 	LibtoolGCCBuildCommandParserTest.class,
 	UpdateConfigureTest.class,
-	AutoconfTests.class,
 	EditorTests.class
 })
 public class AllAutotoolsTests {
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AllTests.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AllTests.java
index ec804247016..ba426353ae2 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AllTests.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AllTests.java
@@ -13,6 +13,7 @@ package org.eclipse.cdt.autotools.ui.tests;
 
 import java.io.IOException;
 
+import org.eclipse.cdt.autotools.ui.tests.autoconf.AutoconfTests;
 import org.eclipse.cdt.utils.spawner.ProcessFactory;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -24,7 +25,8 @@ import org.junit.runners.Suite;
 	TestToolActions.class,
 	TestEnvironmentVars.class,
 	TestMakeTargets.class,
-	SetConfigurationParameter.class
+	SetConfigurationParameter.class,
+	AutoconfTests.class
 })
 
 public class AllTests {
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/AutoconfTests.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java
similarity index 93%
rename from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/AutoconfTests.java
rename to build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java
index 659e603a066..58af3a809ca 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/AutoconfTests.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat Incorporated - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.autotools.tests.autoconf;
+package org.eclipse.cdt.autotools.ui.tests.autoconf;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/BaseParserTest.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java
similarity index 99%
rename from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/BaseParserTest.java
rename to build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java
index 1d44c7f0fd8..dc71f59a840 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/BaseParserTest.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Ed Swartz (Nokia) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.autotools.tests.autoconf;
+package org.eclipse.cdt.autotools.ui.tests.autoconf;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestMacroParser.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestMacroParser.java
similarity index 99%
rename from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestMacroParser.java
rename to build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestMacroParser.java
index f525a4238c1..635b1ae4d83 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestMacroParser.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestMacroParser.java
@@ -9,7 +9,7 @@
  *    Ed Swartz (Nokia) - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.autotools.tests.autoconf;
+package org.eclipse.cdt.autotools.ui.tests.autoconf;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestShellParser.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestShellParser.java
similarity index 99%
rename from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestShellParser.java
rename to build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestShellParser.java
index 6de50699e16..b407d77c019 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestShellParser.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestShellParser.java
@@ -9,7 +9,7 @@
  *    Ed Swartz (Nokia) - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.autotools.tests.autoconf;
+package org.eclipse.cdt.autotools.ui.tests.autoconf;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestTokenizer.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java
similarity index 99%
rename from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestTokenizer.java
rename to build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java
index dc05b7fd216..4c64f8a4137 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/autoconf/TestTokenizer.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java
@@ -9,7 +9,7 @@
  *    Ed Swartz (Nokia) - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.autotools.tests.autoconf;
+package org.eclipse.cdt.autotools.ui.tests.autoconf;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;