diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index b7f17f50a37..60635269fb8 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -2,9 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-mobile-tests := mobile/android/base/tests
+mobile-tests := mobile/android/tests/browser/robocop
 TESTPATH     := $(topsrcdir)/$(mobile-tests)
-dir-tests    := $(DEPTH)/$(mobile-tests)
 
 ANDROID_APK_NAME := robocop-debug
 
@@ -62,8 +61,6 @@ include $(topsrcdir)/config/rules.mk
 
 tools:: $(ANDROID_APK_NAME).apk
 
-GENERATED_DIRS += $(dir-tests)
-
 # The test APK needs to know the contents of the target APK while not
 # being linked against them.  This is a best effort to avoid getting
 # out of sync with base's build config.
diff --git a/build/mobile/robocop/README b/build/mobile/robocop/README
index ba567c68b84..9da93e64961 100644
--- a/build/mobile/robocop/README
+++ b/build/mobile/robocop/README
@@ -9,4 +9,4 @@ from the original download found at:
 http://code.google.com/p/robotium/
 
 Firefox for Android developers should read the documentation in
-mobile/android/base/tests/README.rst.
+mobile/android/tests/browser/robocop/README.rst.
diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build
index 70c4e125b6c..5145e1219a4 100644
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -6,20 +6,7 @@
 
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
 
-main = add_android_eclipse_project('Robocop', OBJDIR + '/AndroidManifest.xml')
-main.package_name = 'org.mozilla.roboexample.test'
-main.res = SRCDIR + '/res'
-main.recursive_make_targets += [OBJDIR + '/AndroidManifest.xml']
-main.extra_jars += [SRCDIR + '/robotium-solo-4.3.1.jar']
-main.assets = TOPSRCDIR + '/mobile/android/base/tests/assets'
-main.referenced_projects += ['Fennec']
-
-main.add_classpathentry('harness', SRCDIR,
-    dstdir='harness/org/mozilla/gecko')
-main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests',
-    dstdir='src/org/mozilla/gecko/tests')
-
-base = '/mobile/android/base/tests/'
+base = '/mobile/android/tests/browser/robocop/'
 TEST_HARNESS_FILES.testing.mochitest += [
     base + 'robocop.ini',
     base + 'robocop_autophone.ini',
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index feb92072deb..37620f3ff0b 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -817,7 +817,6 @@ main.package_name = 'org.mozilla.gecko'
 # .project file to modify this list.
 main.filtered_resources += [
     '1.0-projectRelativePath-matches-false-false-*org/mozilla/gecko/resources/**',
-    '1.0-projectRelativePath-matches-false-false-*org/mozilla/gecko/tests/**',
 ]
 
 main.recursive_make_targets += generated_recursive_make_targets
@@ -837,7 +836,6 @@ main.res = None
 cpe = main.add_classpathentry('src', SRCDIR,
     dstdir='src/org/mozilla/gecko',
     exclude_patterns=[
-        'org/mozilla/gecko/tests/**',
         'org/mozilla/gecko/resources/**'])
 
 if not CONFIG['MOZ_CRASHREPORTER']:
diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py
index 55301ce9156..b55a32f655e 100644
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -118,12 +118,12 @@ class MachCommands(MachCommandBase):
         objdir('app/src/main/AndroidManifest.xml', 'mobile/android/base/AndroidManifest.xml')
         objdir('app/src/androidTest/AndroidManifest.xml', 'build/mobile/robocop/AndroidManifest.xml')
         srcdir('app/src/androidTest/res', 'build/mobile/robocop/res')
-        srcdir('app/src/androidTest/assets', 'mobile/android/base/tests/assets')
+        srcdir('app/src/androidTest/assets', 'mobile/android/tests/browser/robocop/assets')
         objdir('app/src/debug/assets', 'dist/fennec/assets')
         objdir('app/src/debug/jniLibs', 'dist/fennec/lib')
         # Test code.
         srcdir('app/src/robocop_harness/org/mozilla/gecko', 'build/mobile/robocop')
-        srcdir('app/src/robocop/org/mozilla/gecko/tests', 'mobile/android/base/tests')
+        srcdir('app/src/robocop/org/mozilla/gecko/tests', 'mobile/android/tests/browser/robocop')
         srcdir('app/src/background/org/mozilla/gecko', 'mobile/android/tests/background/junit3/src')
         srcdir('app/src/browser/org/mozilla/gecko', 'mobile/android/tests/browser/junit3/src')
         # Test libraries.
diff --git a/testing/mochitest/roboextender/Makefile.in b/testing/mochitest/roboextender/Makefile.in
index 9bfaee1d3bb..b36e8be2f75 100644
--- a/testing/mochitest/roboextender/Makefile.in
+++ b/testing/mochitest/roboextender/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TESTPATH        = $(topsrcdir)/mobile/android/base/tests/roboextender
+TESTPATH = $(topsrcdir)/mobile/android/tests/browser/robocop/roboextender
 
 include $(DEPTH)/config/autoconf.mk