diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 962e96c43bfba..42167c7872d0c 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -18,13 +18,10 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := core framework
 
 LOCAL_MODULE:= android.test.runner
 
 include $(BUILD_JAVA_LIBRARY)
-
-# additionally, build unit tests in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test-runner/src/android/test/ActivityInstrumentationTestCase.java b/test-runner/android/test/ActivityInstrumentationTestCase.java
similarity index 100%
rename from test-runner/src/android/test/ActivityInstrumentationTestCase.java
rename to test-runner/android/test/ActivityInstrumentationTestCase.java
diff --git a/test-runner/src/android/test/ActivityInstrumentationTestCase2.java b/test-runner/android/test/ActivityInstrumentationTestCase2.java
similarity index 100%
rename from test-runner/src/android/test/ActivityInstrumentationTestCase2.java
rename to test-runner/android/test/ActivityInstrumentationTestCase2.java
diff --git a/test-runner/src/android/test/ActivityTestCase.java b/test-runner/android/test/ActivityTestCase.java
similarity index 100%
rename from test-runner/src/android/test/ActivityTestCase.java
rename to test-runner/android/test/ActivityTestCase.java
diff --git a/test-runner/src/android/test/ActivityUnitTestCase.java b/test-runner/android/test/ActivityUnitTestCase.java
similarity index 100%
rename from test-runner/src/android/test/ActivityUnitTestCase.java
rename to test-runner/android/test/ActivityUnitTestCase.java
diff --git a/test-runner/src/android/test/AndroidTestRunner.java b/test-runner/android/test/AndroidTestRunner.java
similarity index 100%
rename from test-runner/src/android/test/AndroidTestRunner.java
rename to test-runner/android/test/AndroidTestRunner.java
diff --git a/test-runner/src/android/test/ApplicationTestCase.java b/test-runner/android/test/ApplicationTestCase.java
similarity index 100%
rename from test-runner/src/android/test/ApplicationTestCase.java
rename to test-runner/android/test/ApplicationTestCase.java
diff --git a/test-runner/src/android/test/AssertionFailedError.java b/test-runner/android/test/AssertionFailedError.java
similarity index 100%
rename from test-runner/src/android/test/AssertionFailedError.java
rename to test-runner/android/test/AssertionFailedError.java
diff --git a/test-runner/src/android/test/BundlePrinter.java b/test-runner/android/test/BundlePrinter.java
similarity index 100%
rename from test-runner/src/android/test/BundlePrinter.java
rename to test-runner/android/test/BundlePrinter.java
diff --git a/test-runner/src/android/test/BundleTestListener.java b/test-runner/android/test/BundleTestListener.java
similarity index 100%
rename from test-runner/src/android/test/BundleTestListener.java
rename to test-runner/android/test/BundleTestListener.java
diff --git a/test-runner/src/android/test/ClassPathPackageInfo.java b/test-runner/android/test/ClassPathPackageInfo.java
similarity index 100%
rename from test-runner/src/android/test/ClassPathPackageInfo.java
rename to test-runner/android/test/ClassPathPackageInfo.java
diff --git a/test-runner/src/android/test/ClassPathPackageInfoSource.java b/test-runner/android/test/ClassPathPackageInfoSource.java
similarity index 100%
rename from test-runner/src/android/test/ClassPathPackageInfoSource.java
rename to test-runner/android/test/ClassPathPackageInfoSource.java
diff --git a/test-runner/src/android/test/ComparisonFailure.java b/test-runner/android/test/ComparisonFailure.java
similarity index 100%
rename from test-runner/src/android/test/ComparisonFailure.java
rename to test-runner/android/test/ComparisonFailure.java
diff --git a/test-runner/src/android/test/DatabaseTestUtils.java b/test-runner/android/test/DatabaseTestUtils.java
similarity index 100%
rename from test-runner/src/android/test/DatabaseTestUtils.java
rename to test-runner/android/test/DatabaseTestUtils.java
diff --git a/test-runner/src/android/test/InstrumentationCoreTestRunner.java b/test-runner/android/test/InstrumentationCoreTestRunner.java
similarity index 100%
rename from test-runner/src/android/test/InstrumentationCoreTestRunner.java
rename to test-runner/android/test/InstrumentationCoreTestRunner.java
diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/android/test/InstrumentationTestRunner.java
similarity index 100%
rename from test-runner/src/android/test/InstrumentationTestRunner.java
rename to test-runner/android/test/InstrumentationTestRunner.java
diff --git a/test-runner/src/android/test/InstrumentationUtils.java b/test-runner/android/test/InstrumentationUtils.java
similarity index 100%
rename from test-runner/src/android/test/InstrumentationUtils.java
rename to test-runner/android/test/InstrumentationUtils.java
diff --git a/test-runner/src/android/test/IsolatedContext.java b/test-runner/android/test/IsolatedContext.java
similarity index 100%
rename from test-runner/src/android/test/IsolatedContext.java
rename to test-runner/android/test/IsolatedContext.java
diff --git a/test-runner/src/android/test/LaunchPerformanceBase.java b/test-runner/android/test/LaunchPerformanceBase.java
similarity index 100%
rename from test-runner/src/android/test/LaunchPerformanceBase.java
rename to test-runner/android/test/LaunchPerformanceBase.java
diff --git a/test-runner/src/android/test/MoreAsserts.java b/test-runner/android/test/MoreAsserts.java
similarity index 100%
rename from test-runner/src/android/test/MoreAsserts.java
rename to test-runner/android/test/MoreAsserts.java
diff --git a/test-runner/src/android/test/NoExecTestResult.java b/test-runner/android/test/NoExecTestResult.java
similarity index 100%
rename from test-runner/src/android/test/NoExecTestResult.java
rename to test-runner/android/test/NoExecTestResult.java
diff --git a/test-runner/src/android/test/PackageInfoSources.java b/test-runner/android/test/PackageInfoSources.java
similarity index 100%
rename from test-runner/src/android/test/PackageInfoSources.java
rename to test-runner/android/test/PackageInfoSources.java
diff --git a/test-runner/src/android/test/PerformanceCollectorTestCase.java b/test-runner/android/test/PerformanceCollectorTestCase.java
similarity index 100%
rename from test-runner/src/android/test/PerformanceCollectorTestCase.java
rename to test-runner/android/test/PerformanceCollectorTestCase.java
diff --git a/test-runner/src/android/test/PerformanceTestBase.java b/test-runner/android/test/PerformanceTestBase.java
similarity index 100%
rename from test-runner/src/android/test/PerformanceTestBase.java
rename to test-runner/android/test/PerformanceTestBase.java
diff --git a/test-runner/src/android/test/ProviderTestCase.java b/test-runner/android/test/ProviderTestCase.java
similarity index 100%
rename from test-runner/src/android/test/ProviderTestCase.java
rename to test-runner/android/test/ProviderTestCase.java
diff --git a/test-runner/src/android/test/ProviderTestCase2.java b/test-runner/android/test/ProviderTestCase2.java
similarity index 100%
rename from test-runner/src/android/test/ProviderTestCase2.java
rename to test-runner/android/test/ProviderTestCase2.java
diff --git a/test-runner/src/android/test/RenamingDelegatingContext.java b/test-runner/android/test/RenamingDelegatingContext.java
similarity index 100%
rename from test-runner/src/android/test/RenamingDelegatingContext.java
rename to test-runner/android/test/RenamingDelegatingContext.java
diff --git a/test-runner/src/android/test/ServiceLocator.java b/test-runner/android/test/ServiceLocator.java
similarity index 100%
rename from test-runner/src/android/test/ServiceLocator.java
rename to test-runner/android/test/ServiceLocator.java
diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/android/test/ServiceTestCase.java
similarity index 100%
rename from test-runner/src/android/test/ServiceTestCase.java
rename to test-runner/android/test/ServiceTestCase.java
diff --git a/test-runner/src/android/test/SimpleCache.java b/test-runner/android/test/SimpleCache.java
similarity index 100%
rename from test-runner/src/android/test/SimpleCache.java
rename to test-runner/android/test/SimpleCache.java
diff --git a/test-runner/src/android/test/SingleLaunchActivityTestCase.java b/test-runner/android/test/SingleLaunchActivityTestCase.java
similarity index 100%
rename from test-runner/src/android/test/SingleLaunchActivityTestCase.java
rename to test-runner/android/test/SingleLaunchActivityTestCase.java
diff --git a/test-runner/src/android/test/SyncBaseInstrumentation.java b/test-runner/android/test/SyncBaseInstrumentation.java
similarity index 100%
rename from test-runner/src/android/test/SyncBaseInstrumentation.java
rename to test-runner/android/test/SyncBaseInstrumentation.java
diff --git a/test-runner/src/android/test/TestBrowserActivity.java b/test-runner/android/test/TestBrowserActivity.java
similarity index 100%
rename from test-runner/src/android/test/TestBrowserActivity.java
rename to test-runner/android/test/TestBrowserActivity.java
diff --git a/test-runner/src/android/test/TestBrowserController.java b/test-runner/android/test/TestBrowserController.java
similarity index 100%
rename from test-runner/src/android/test/TestBrowserController.java
rename to test-runner/android/test/TestBrowserController.java
diff --git a/test-runner/src/android/test/TestBrowserControllerImpl.java b/test-runner/android/test/TestBrowserControllerImpl.java
similarity index 100%
rename from test-runner/src/android/test/TestBrowserControllerImpl.java
rename to test-runner/android/test/TestBrowserControllerImpl.java
diff --git a/test-runner/src/android/test/TestBrowserView.java b/test-runner/android/test/TestBrowserView.java
similarity index 100%
rename from test-runner/src/android/test/TestBrowserView.java
rename to test-runner/android/test/TestBrowserView.java
diff --git a/test-runner/src/android/test/TestCase.java b/test-runner/android/test/TestCase.java
similarity index 100%
rename from test-runner/src/android/test/TestCase.java
rename to test-runner/android/test/TestCase.java
diff --git a/test-runner/src/android/test/TestCaseUtil.java b/test-runner/android/test/TestCaseUtil.java
similarity index 100%
rename from test-runner/src/android/test/TestCaseUtil.java
rename to test-runner/android/test/TestCaseUtil.java
diff --git a/test-runner/src/android/test/TestListActivity.java b/test-runner/android/test/TestListActivity.java
similarity index 100%
rename from test-runner/src/android/test/TestListActivity.java
rename to test-runner/android/test/TestListActivity.java
diff --git a/test-runner/src/android/test/TestPrinter.java b/test-runner/android/test/TestPrinter.java
similarity index 100%
rename from test-runner/src/android/test/TestPrinter.java
rename to test-runner/android/test/TestPrinter.java
diff --git a/test-runner/src/android/test/TestRecorder.java b/test-runner/android/test/TestRecorder.java
similarity index 100%
rename from test-runner/src/android/test/TestRecorder.java
rename to test-runner/android/test/TestRecorder.java
diff --git a/test-runner/src/android/test/TestRunner.java b/test-runner/android/test/TestRunner.java
similarity index 100%
rename from test-runner/src/android/test/TestRunner.java
rename to test-runner/android/test/TestRunner.java
diff --git a/test-runner/src/android/test/TestRunnerView.java b/test-runner/android/test/TestRunnerView.java
similarity index 100%
rename from test-runner/src/android/test/TestRunnerView.java
rename to test-runner/android/test/TestRunnerView.java
diff --git a/test-runner/src/android/test/TestSuiteProvider.java b/test-runner/android/test/TestSuiteProvider.java
similarity index 100%
rename from test-runner/src/android/test/TestSuiteProvider.java
rename to test-runner/android/test/TestSuiteProvider.java
diff --git a/test-runner/src/android/test/TimedTest.java b/test-runner/android/test/TimedTest.java
similarity index 100%
rename from test-runner/src/android/test/TimedTest.java
rename to test-runner/android/test/TimedTest.java
diff --git a/test-runner/src/android/test/TouchUtils.java b/test-runner/android/test/TouchUtils.java
similarity index 100%
rename from test-runner/src/android/test/TouchUtils.java
rename to test-runner/android/test/TouchUtils.java
diff --git a/test-runner/src/android/test/ViewAsserts.java b/test-runner/android/test/ViewAsserts.java
similarity index 100%
rename from test-runner/src/android/test/ViewAsserts.java
rename to test-runner/android/test/ViewAsserts.java
diff --git a/test-runner/src/android/test/mock/MockApplication.java b/test-runner/android/test/mock/MockApplication.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockApplication.java
rename to test-runner/android/test/mock/MockApplication.java
diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-runner/android/test/mock/MockContentProvider.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockContentProvider.java
rename to test-runner/android/test/mock/MockContentProvider.java
diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-runner/android/test/mock/MockContentResolver.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockContentResolver.java
rename to test-runner/android/test/mock/MockContentResolver.java
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/android/test/mock/MockContext.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockContext.java
rename to test-runner/android/test/mock/MockContext.java
diff --git a/test-runner/src/android/test/mock/MockCursor.java b/test-runner/android/test/mock/MockCursor.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockCursor.java
rename to test-runner/android/test/mock/MockCursor.java
diff --git a/test-runner/src/android/test/mock/MockDialogInterface.java b/test-runner/android/test/mock/MockDialogInterface.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockDialogInterface.java
rename to test-runner/android/test/mock/MockDialogInterface.java
diff --git a/test-runner/src/android/test/mock/MockIContentProvider.java b/test-runner/android/test/mock/MockIContentProvider.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockIContentProvider.java
rename to test-runner/android/test/mock/MockIContentProvider.java
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/android/test/mock/MockPackageManager.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockPackageManager.java
rename to test-runner/android/test/mock/MockPackageManager.java
diff --git a/test-runner/src/android/test/mock/MockResources.java b/test-runner/android/test/mock/MockResources.java
similarity index 100%
rename from test-runner/src/android/test/mock/MockResources.java
rename to test-runner/android/test/mock/MockResources.java
diff --git a/test-runner/src/android/test/mock/package.html b/test-runner/android/test/mock/package.html
similarity index 100%
rename from test-runner/src/android/test/mock/package.html
rename to test-runner/android/test/mock/package.html
diff --git a/test-runner/src/android/test/suitebuilder/AssignableFrom.java b/test-runner/android/test/suitebuilder/AssignableFrom.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/AssignableFrom.java
rename to test-runner/android/test/suitebuilder/AssignableFrom.java
diff --git a/test-runner/src/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java b/test-runner/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
rename to test-runner/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/SmokeTestSuiteBuilder.java b/test-runner/android/test/suitebuilder/SmokeTestSuiteBuilder.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/SmokeTestSuiteBuilder.java
rename to test-runner/android/test/suitebuilder/SmokeTestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/TestGrouping.java b/test-runner/android/test/suitebuilder/TestGrouping.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/TestGrouping.java
rename to test-runner/android/test/suitebuilder/TestGrouping.java
diff --git a/test-runner/src/android/test/suitebuilder/TestMethod.java b/test-runner/android/test/suitebuilder/TestMethod.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/TestMethod.java
rename to test-runner/android/test/suitebuilder/TestMethod.java
diff --git a/test-runner/src/android/test/suitebuilder/TestPredicates.java b/test-runner/android/test/suitebuilder/TestPredicates.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/TestPredicates.java
rename to test-runner/android/test/suitebuilder/TestPredicates.java
diff --git a/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java b/test-runner/android/test/suitebuilder/TestSuiteBuilder.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java
rename to test-runner/android/test/suitebuilder/TestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java b/test-runner/android/test/suitebuilder/UnitTestSuiteBuilder.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java
rename to test-runner/android/test/suitebuilder/UnitTestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/HasAnnotation.java b/test-runner/android/test/suitebuilder/annotation/HasAnnotation.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/annotation/HasAnnotation.java
rename to test-runner/android/test/suitebuilder/annotation/HasAnnotation.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/HasClassAnnotation.java b/test-runner/android/test/suitebuilder/annotation/HasClassAnnotation.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/annotation/HasClassAnnotation.java
rename to test-runner/android/test/suitebuilder/annotation/HasClassAnnotation.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/HasMethodAnnotation.java b/test-runner/android/test/suitebuilder/annotation/HasMethodAnnotation.java
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/annotation/HasMethodAnnotation.java
rename to test-runner/android/test/suitebuilder/annotation/HasMethodAnnotation.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/package.html b/test-runner/android/test/suitebuilder/annotation/package.html
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/annotation/package.html
rename to test-runner/android/test/suitebuilder/annotation/package.html
diff --git a/test-runner/src/android/test/suitebuilder/package.html b/test-runner/android/test/suitebuilder/package.html
similarity index 100%
rename from test-runner/src/android/test/suitebuilder/package.html
rename to test-runner/android/test/suitebuilder/package.html
diff --git a/test-runner/src/junit/MODULE_LICENSE_CPL b/test-runner/junit/MODULE_LICENSE_CPL
similarity index 100%
rename from test-runner/src/junit/MODULE_LICENSE_CPL
rename to test-runner/junit/MODULE_LICENSE_CPL
diff --git a/test-runner/src/junit/runner/BaseTestRunner.java b/test-runner/junit/runner/BaseTestRunner.java
similarity index 100%
rename from test-runner/src/junit/runner/BaseTestRunner.java
rename to test-runner/junit/runner/BaseTestRunner.java
diff --git a/test-runner/src/junit/runner/ClassPathTestCollector.java b/test-runner/junit/runner/ClassPathTestCollector.java
similarity index 100%
rename from test-runner/src/junit/runner/ClassPathTestCollector.java
rename to test-runner/junit/runner/ClassPathTestCollector.java
diff --git a/test-runner/src/junit/runner/FailureDetailView.java b/test-runner/junit/runner/FailureDetailView.java
similarity index 100%
rename from test-runner/src/junit/runner/FailureDetailView.java
rename to test-runner/junit/runner/FailureDetailView.java
diff --git a/test-runner/src/junit/runner/LoadingTestCollector.java b/test-runner/junit/runner/LoadingTestCollector.java
similarity index 100%
rename from test-runner/src/junit/runner/LoadingTestCollector.java
rename to test-runner/junit/runner/LoadingTestCollector.java
diff --git a/test-runner/src/junit/runner/ReloadingTestSuiteLoader.java b/test-runner/junit/runner/ReloadingTestSuiteLoader.java
similarity index 100%
rename from test-runner/src/junit/runner/ReloadingTestSuiteLoader.java
rename to test-runner/junit/runner/ReloadingTestSuiteLoader.java
diff --git a/test-runner/src/junit/runner/SimpleTestCollector.java b/test-runner/junit/runner/SimpleTestCollector.java
similarity index 100%
rename from test-runner/src/junit/runner/SimpleTestCollector.java
rename to test-runner/junit/runner/SimpleTestCollector.java
diff --git a/test-runner/src/junit/runner/Sorter.java b/test-runner/junit/runner/Sorter.java
similarity index 100%
rename from test-runner/src/junit/runner/Sorter.java
rename to test-runner/junit/runner/Sorter.java
diff --git a/test-runner/src/junit/runner/StandardTestSuiteLoader.java b/test-runner/junit/runner/StandardTestSuiteLoader.java
similarity index 100%
rename from test-runner/src/junit/runner/StandardTestSuiteLoader.java
rename to test-runner/junit/runner/StandardTestSuiteLoader.java
diff --git a/test-runner/src/junit/runner/TestCaseClassLoader.java b/test-runner/junit/runner/TestCaseClassLoader.java
similarity index 100%
rename from test-runner/src/junit/runner/TestCaseClassLoader.java
rename to test-runner/junit/runner/TestCaseClassLoader.java
diff --git a/test-runner/src/junit/runner/TestCollector.java b/test-runner/junit/runner/TestCollector.java
similarity index 100%
rename from test-runner/src/junit/runner/TestCollector.java
rename to test-runner/junit/runner/TestCollector.java
diff --git a/test-runner/src/junit/runner/TestRunListener.java b/test-runner/junit/runner/TestRunListener.java
similarity index 100%
rename from test-runner/src/junit/runner/TestRunListener.java
rename to test-runner/junit/runner/TestRunListener.java
diff --git a/test-runner/src/junit/runner/TestSuiteLoader.java b/test-runner/junit/runner/TestSuiteLoader.java
similarity index 100%
rename from test-runner/src/junit/runner/TestSuiteLoader.java
rename to test-runner/junit/runner/TestSuiteLoader.java
diff --git a/test-runner/src/junit/runner/Version.java b/test-runner/junit/runner/Version.java
similarity index 100%
rename from test-runner/src/junit/runner/Version.java
rename to test-runner/junit/runner/Version.java
diff --git a/test-runner/src/junit/runner/excluded.properties b/test-runner/junit/runner/excluded.properties
similarity index 100%
rename from test-runner/src/junit/runner/excluded.properties
rename to test-runner/junit/runner/excluded.properties
diff --git a/test-runner/src/junit/runner/logo.gif b/test-runner/junit/runner/logo.gif
similarity index 100%
rename from test-runner/src/junit/runner/logo.gif
rename to test-runner/junit/runner/logo.gif
diff --git a/test-runner/src/junit/runner/package.html b/test-runner/junit/runner/package.html
similarity index 100%
rename from test-runner/src/junit/runner/package.html
rename to test-runner/junit/runner/package.html
diff --git a/test-runner/src/junit/runner/smalllogo.gif b/test-runner/junit/runner/smalllogo.gif
similarity index 100%
rename from test-runner/src/junit/runner/smalllogo.gif
rename to test-runner/junit/runner/smalllogo.gif
diff --git a/test-runner/src/junit/textui/ResultPrinter.java b/test-runner/junit/textui/ResultPrinter.java
similarity index 100%
rename from test-runner/src/junit/textui/ResultPrinter.java
rename to test-runner/junit/textui/ResultPrinter.java
diff --git a/test-runner/src/junit/textui/TestRunner.java b/test-runner/junit/textui/TestRunner.java
similarity index 100%
rename from test-runner/src/junit/textui/TestRunner.java
rename to test-runner/junit/textui/TestRunner.java
diff --git a/test-runner/src/junit/textui/package.html b/test-runner/junit/textui/package.html
similarity index 100%
rename from test-runner/src/junit/textui/package.html
rename to test-runner/junit/textui/package.html
diff --git a/test-runner/tests/Android.mk b/test-runner/tests/Android.mk
deleted file mode 100644
index d1efe7b17e23d..0000000000000
--- a/test-runner/tests/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2010, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := FrameworkTestRunnerTests
-
-include $(BUILD_PACKAGE)
-
diff --git a/test-runner/tests/AndroidManifest.xml b/test-runner/tests/AndroidManifest.xml
deleted file mode 100644
index 4f323928994ca..0000000000000
--- a/test-runner/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.frameworks.testrunner.tests">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="android.test.StubTestBrowserActivity"
-            android:label="Stubbed Test Browser">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FOR_TESTS_ONLY"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.test.TestBrowserTests"
-            android:label="Test Browser Tests">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.UNIT_TEST"/>
-            </intent-filter>
-        </activity>`
-    </application>
-
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.frameworks.testrunner.tests"
-        android:label="Framework testrunner tests" />
-</manifest>
diff --git a/tests/CoreTests/android/AndroidManifest.xml b/tests/CoreTests/android/AndroidManifest.xml
index f02673cb23a37..98cc9e501ad17 100644
--- a/tests/CoreTests/android/AndroidManifest.xml
+++ b/tests/CoreTests/android/AndroidManifest.xml
@@ -34,6 +34,19 @@
     
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="StubTestBrowserActivity" android:label="Stubbed Test Browser">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FOR_TESTS_ONLY"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.test.TestBrowserTests" android:label="Test Browser Tests">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.UNIT_TEST"/>
+            </intent-filter>
+        </activity>
     </application>
 
     <instrumentation
diff --git a/test-runner/tests/src/android/test/AndroidTestRunnerTest.java b/tests/CoreTests/android/test/AndroidTestRunnerTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/AndroidTestRunnerTest.java
rename to tests/CoreTests/android/test/AndroidTestRunnerTest.java
diff --git a/test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java b/tests/CoreTests/android/test/InstrumentationTestRunnerTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java
rename to tests/CoreTests/android/test/InstrumentationTestRunnerTest.java
diff --git a/test-runner/tests/src/android/test/StubTestBrowserActivity.java b/tests/CoreTests/android/test/StubTestBrowserActivity.java
similarity index 100%
rename from test-runner/tests/src/android/test/StubTestBrowserActivity.java
rename to tests/CoreTests/android/test/StubTestBrowserActivity.java
diff --git a/test-runner/tests/src/android/test/TestBrowserActivityTest.java b/tests/CoreTests/android/test/TestBrowserActivityTest.java
similarity index 96%
rename from test-runner/tests/src/android/test/TestBrowserActivityTest.java
rename to tests/CoreTests/android/test/TestBrowserActivityTest.java
index 355409e0deac5..6afbe3717a37b 100644
--- a/test-runner/tests/src/android/test/TestBrowserActivityTest.java
+++ b/tests/CoreTests/android/test/TestBrowserActivityTest.java
@@ -215,24 +215,19 @@ public class TestBrowserActivityTest extends InstrumentationTestCase {
     }
 
     private TestBrowserActivity createActivity() throws RemoteException {
-        return launchActivity(getAndroidPackageName(), StubTestBrowserActivity.class, null);
+        return launchActivity("android.test", StubTestBrowserActivity.class, null);
     }
 
     private Intent createIntent(TestSuite testSuite) {
         Intent intent = new Intent(Intent.ACTION_RUN);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         String className = StubTestBrowserActivity.class.getName();
-        String packageName = getAndroidPackageName();
+        String packageName = className.substring(0, className.lastIndexOf("."));
         intent.setClassName(packageName, className);
         intent.setData(Uri.parse(testSuite.getName()));
         return intent;
     }
 
-    private String getAndroidPackageName() {
-        String packageName = getInstrumentation().getTargetContext().getPackageName();
-        return packageName;
-    }
-
     private TestBrowserActivity launchTestBrowserActivity(TestSuite testSuite)
             throws RemoteException {
         getInstrumentation().setInTouchMode(false);
diff --git a/test-runner/tests/src/android/test/TestBrowserControllerImplTest.java b/tests/CoreTests/android/test/TestBrowserControllerImplTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/TestBrowserControllerImplTest.java
rename to tests/CoreTests/android/test/TestBrowserControllerImplTest.java
diff --git a/test-runner/tests/src/android/test/TestBrowserTests.java b/tests/CoreTests/android/test/TestBrowserTests.java
similarity index 100%
rename from test-runner/tests/src/android/test/TestBrowserTests.java
rename to tests/CoreTests/android/test/TestBrowserTests.java
diff --git a/test-runner/tests/src/android/test/TestCaseUtilTest.java b/tests/CoreTests/android/test/TestCaseUtilTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/TestCaseUtilTest.java
rename to tests/CoreTests/android/test/TestCaseUtilTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/AssignableFromTest.java b/tests/CoreTests/android/test/suitebuilder/AssignableFromTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/AssignableFromTest.java
rename to tests/CoreTests/android/test/suitebuilder/AssignableFromTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
rename to tests/CoreTests/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/ListTestCaseNames.java b/tests/CoreTests/android/test/suitebuilder/ListTestCaseNames.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/ListTestCaseNames.java
rename to tests/CoreTests/android/test/suitebuilder/ListTestCaseNames.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
rename to tests/CoreTests/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/TestSuiteBuilderTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java
rename to tests/CoreTests/android/test/suitebuilder/TestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/UnitTestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
rename to tests/CoreTests/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/annotation/HasAnnotationTest.java b/tests/CoreTests/android/test/suitebuilder/annotation/HasAnnotationTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/annotation/HasAnnotationTest.java
rename to tests/CoreTests/android/test/suitebuilder/annotation/HasAnnotationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/annotation/HasClassAnnotationTest.java b/tests/CoreTests/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
rename to tests/CoreTests/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java b/tests/CoreTests/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
rename to tests/CoreTests/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/OuterTest.java b/tests/CoreTests/android/test/suitebuilder/examples/OuterTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/OuterTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/OuterTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/error/ErrorTest.java b/tests/CoreTests/android/test/suitebuilder/examples/error/ErrorTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/error/ErrorTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/error/ErrorTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/error/FailingTest.java b/tests/CoreTests/android/test/suitebuilder/examples/error/FailingTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/error/FailingTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/error/FailingTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java b/tests/CoreTests/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/nested/Level1Test.java b/tests/CoreTests/android/test/suitebuilder/examples/nested/Level1Test.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/nested/Level1Test.java
rename to tests/CoreTests/android/test/suitebuilder/examples/nested/Level1Test.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/nested/nested/Level2Test.java b/tests/CoreTests/android/test/suitebuilder/examples/nested/nested/Level2Test.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/nested/nested/Level2Test.java
rename to tests/CoreTests/android/test/suitebuilder/examples/nested/nested/Level2Test.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java b/tests/CoreTests/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/simple/SimpleTest.java b/tests/CoreTests/android/test/suitebuilder/examples/simple/SimpleTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/simple/SimpleTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/simple/SimpleTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/smoke/NonSmokeTest.java b/tests/CoreTests/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/smoke/SmokeTest.java b/tests/CoreTests/android/test/suitebuilder/examples/smoke/SmokeTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/smoke/SmokeTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/smoke/SmokeTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SubclassTest.java b/tests/CoreTests/android/test/suitebuilder/examples/subclass/SubclassTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/subclass/SubclassTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/subclass/SubclassTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SuperclassTest.java b/tests/CoreTests/android/test/suitebuilder/examples/subclass/SuperclassTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/subclass/SuperclassTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/subclass/SuperclassTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java b/tests/CoreTests/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java b/tests/CoreTests/android/test/suitebuilder/examples/suppress/SuppressedTest.java
similarity index 100%
rename from test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java
rename to tests/CoreTests/android/test/suitebuilder/examples/suppress/SuppressedTest.java