diff --git a/mobile/android/tests/browser/junit3/AndroidManifest.xml.in b/mobile/android/tests/browser/junit3/AndroidManifest.xml.in
index cf0918bc6c0..d3e8309d1fb 100644
--- a/mobile/android/tests/browser/junit3/AndroidManifest.xml.in
+++ b/mobile/android/tests/browser/junit3/AndroidManifest.xml.in
@@ -22,6 +22,6 @@
 
     <instrumentation
         android:label="@string/app_name"
-        android:name="org.mozilla.gecko.browser.harness.BrowserInstrumentationTestRunner"
+        android:name="org.mozilla.gecko.harness.BrowserInstrumentationTestRunner"
         android:targetPackage="@ANDROID_BROWSER_TARGET_PACKAGE_NAME@" />
 </manifest>
diff --git a/mobile/android/tests/browser/junit3/moz.build b/mobile/android/tests/browser/junit3/moz.build
index 631a58e13d4..2e1935031e9 100644
--- a/mobile/android/tests/browser/junit3/moz.build
+++ b/mobile/android/tests/browser/junit3/moz.build
@@ -8,16 +8,16 @@ DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
 
 jar = add_java_jar('browser-junit3')
 jar.sources += [
+    'src/BrowserTestCase.java',
     'src/harness/BrowserInstrumentationTestRunner.java',
     'src/harness/BrowserTestListener.java',
-    'src/tests/BrowserTestCase.java',
-    'src/tests/TestDistribution.java',
-    'src/tests/TestGeckoSharedPrefs.java',
-    'src/tests/TestImageDownloader.java',
-    'src/tests/TestJarReader.java',
-    'src/tests/TestRawResource.java',
-    'src/tests/TestSuggestedSites.java',
-    'src/tests/TestTopSitesCursorWrapper.java',
+    'src/TestDistribution.java',
+    'src/TestGeckoSharedPrefs.java',
+    'src/TestImageDownloader.java',
+    'src/TestJarReader.java',
+    'src/TestRawResource.java',
+    'src/TestSuggestedSites.java',
+    'src/TestTopSitesCursorWrapper.java',
 ]
 jar.generated_sources = [] # None yet -- try to keep it this way.
 jar.javac_flags += ['-Xlint:all,-unchecked']
@@ -36,4 +36,4 @@ main.recursive_make_targets += [OBJDIR + '/generated/' + f for f in jar.generate
 main.referenced_projects += ['Fennec']
 
 main.add_classpathentry('src', SRCDIR + '/src',
-    dstdir='src/org/mozilla/gecko/browser')
+    dstdir='src/org/mozilla/gecko')
diff --git a/mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java b/mobile/android/tests/browser/junit3/src/BrowserTestCase.java
similarity index 97%
rename from mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java
rename to mobile/android/tests/browser/junit3/src/BrowserTestCase.java
index 20b83eb314c..c92a6ed2bb2 100644
--- a/mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java
+++ b/mobile/android/tests/browser/junit3/src/BrowserTestCase.java
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import org.mozilla.gecko.AppConstants;
 
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestDistribution.java b/mobile/android/tests/browser/junit3/src/TestDistribution.java
similarity index 97%
rename from mobile/android/tests/browser/junit3/src/tests/TestDistribution.java
rename to mobile/android/tests/browser/junit3/src/TestDistribution.java
index dcc2a9fafc7..914ff891faa 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestDistribution.java
+++ b/mobile/android/tests/browser/junit3/src/TestDistribution.java
@@ -2,7 +2,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/. */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import org.mozilla.gecko.distribution.ReferrerDescriptor;
 
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestGeckoMenu.java b/mobile/android/tests/browser/junit3/src/TestGeckoMenu.java
similarity index 97%
rename from mobile/android/tests/browser/junit3/src/tests/TestGeckoMenu.java
rename to mobile/android/tests/browser/junit3/src/TestGeckoMenu.java
index 0033a1213d6..ee8426ae878 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestGeckoMenu.java
+++ b/mobile/android/tests/browser/junit3/src/TestGeckoMenu.java
@@ -2,7 +2,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/. */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.menu.GeckoMenu;
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestGeckoProfilesProvider.java b/mobile/android/tests/browser/junit3/src/TestGeckoProfilesProvider.java
similarity index 97%
rename from mobile/android/tests/browser/junit3/src/tests/TestGeckoProfilesProvider.java
rename to mobile/android/tests/browser/junit3/src/TestGeckoProfilesProvider.java
index dbc4fd38888..7343a5a2b5a 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestGeckoProfilesProvider.java
+++ b/mobile/android/tests/browser/junit3/src/TestGeckoProfilesProvider.java
@@ -2,7 +2,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/. */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestGeckoSharedPrefs.java b/mobile/android/tests/browser/junit3/src/TestGeckoSharedPrefs.java
similarity index 96%
rename from mobile/android/tests/browser/junit3/src/tests/TestGeckoSharedPrefs.java
rename to mobile/android/tests/browser/junit3/src/TestGeckoSharedPrefs.java
index 3b416a9ab33..76e86aff670 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestGeckoSharedPrefs.java
+++ b/mobile/android/tests/browser/junit3/src/TestGeckoSharedPrefs.java
@@ -1,23 +1,19 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.Map;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.mozilla.gecko.GeckoProfile;
-import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.GeckoSharedPrefs.Flags;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.test.RenamingDelegatingContext;
 
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestImageDownloader.java b/mobile/android/tests/browser/junit3/src/TestImageDownloader.java
similarity index 99%
rename from mobile/android/tests/browser/junit3/src/tests/TestImageDownloader.java
rename to mobile/android/tests/browser/junit3/src/TestImageDownloader.java
index dfa3162ec35..b2b8c8c6a71 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestImageDownloader.java
+++ b/mobile/android/tests/browser/junit3/src/TestImageDownloader.java
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestJarReader.java b/mobile/android/tests/browser/junit3/src/TestJarReader.java
similarity index 97%
rename from mobile/android/tests/browser/junit3/src/tests/TestJarReader.java
rename to mobile/android/tests/browser/junit3/src/TestJarReader.java
index e33345b7600..7626301cfab 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestJarReader.java
+++ b/mobile/android/tests/browser/junit3/src/TestJarReader.java
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import java.io.InputStream;
 
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestRawResource.java b/mobile/android/tests/browser/junit3/src/TestRawResource.java
similarity index 96%
rename from mobile/android/tests/browser/junit3/src/tests/TestRawResource.java
rename to mobile/android/tests/browser/junit3/src/TestRawResource.java
index 96f41a327e6..c592371862a 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestRawResource.java
+++ b/mobile/android/tests/browser/junit3/src/TestRawResource.java
@@ -1,19 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.mozilla.gecko.util.RawResource;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.test.mock.MockContext;
 import android.test.mock.MockResources;
-import android.util.TypedValue;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-
-import org.mozilla.gecko.util.RawResource;
 
 /**
  * Tests whether RawResource.getAsString() produces the right String
@@ -64,4 +63,4 @@ public class TestRawResource extends BrowserTestCase {
 
         assertEquals(RAW_CONTENTS, result);
     }
-}
\ No newline at end of file
+}
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestSuggestedSites.java b/mobile/android/tests/browser/junit3/src/TestSuggestedSites.java
similarity index 97%
rename from mobile/android/tests/browser/junit3/src/tests/TestSuggestedSites.java
rename to mobile/android/tests/browser/junit3/src/TestSuggestedSites.java
index 20fea7adb18..aa459795217 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestSuggestedSites.java
+++ b/mobile/android/tests/browser/junit3/src/TestSuggestedSites.java
@@ -1,48 +1,40 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.tests;
-
-import android.content.Context;
-import android.content.ContentResolver;
-import android.content.res.Resources;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.SystemClock;
-import android.test.mock.MockResources;
-import android.test.RenamingDelegatingContext;
+package org.mozilla.gecko;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URI;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.jar.JarInputStream;
-import java.util.Map;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-
-import org.mozilla.gecko.BrowserLocaleManager;
-import org.mozilla.gecko.R;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.SuggestedSites;
 import org.mozilla.gecko.distribution.Distribution;
-import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.preferences.GeckoPreferences;
 
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.test.RenamingDelegatingContext;
+import android.test.mock.MockResources;
+
 public class TestSuggestedSites extends BrowserTestCase {
     private static class TestContext extends RenamingDelegatingContext {
         private static final String PREFIX = "TestSuggestedSites-";
@@ -94,12 +86,10 @@ public class TestSuggestedSites extends BrowserTestCase {
     }
 
     private static class TestDistribution extends Distribution {
-        private final Context context;
         private final Map<Locale, File> filesPerLocale;
 
         public TestDistribution(Context context) {
             super(context);
-            this.context = context;
             this.filesPerLocale = new HashMap<Locale, File>();
         }
 
diff --git a/mobile/android/tests/browser/junit3/src/tests/TestTopSitesCursorWrapper.java b/mobile/android/tests/browser/junit3/src/TestTopSitesCursorWrapper.java
similarity index 99%
rename from mobile/android/tests/browser/junit3/src/tests/TestTopSitesCursorWrapper.java
rename to mobile/android/tests/browser/junit3/src/TestTopSitesCursorWrapper.java
index 6fcc888cd65..355a12963c3 100644
--- a/mobile/android/tests/browser/junit3/src/tests/TestTopSitesCursorWrapper.java
+++ b/mobile/android/tests/browser/junit3/src/TestTopSitesCursorWrapper.java
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.tests;
+package org.mozilla.gecko;
 
 import android.database.Cursor;
 import android.database.MatrixCursor;
@@ -385,4 +385,4 @@ public class TestTopSitesCursorWrapper extends BrowserTestCase {
 
         c.close();
     }
-}
\ No newline at end of file
+}
diff --git a/mobile/android/tests/browser/junit3/src/harness/BrowserInstrumentationTestRunner.java b/mobile/android/tests/browser/junit3/src/harness/BrowserInstrumentationTestRunner.java
index 94d90a0e8ff..7dc34cbe185 100644
--- a/mobile/android/tests/browser/junit3/src/harness/BrowserInstrumentationTestRunner.java
+++ b/mobile/android/tests/browser/junit3/src/harness/BrowserInstrumentationTestRunner.java
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.harness;
+package org.mozilla.gecko.harness;
 
 import android.os.Bundle;
 import android.test.AndroidTestRunner;
diff --git a/mobile/android/tests/browser/junit3/src/harness/BrowserTestListener.java b/mobile/android/tests/browser/junit3/src/harness/BrowserTestListener.java
index a29acd915da..b46bdb34fa5 100644
--- a/mobile/android/tests/browser/junit3/src/harness/BrowserTestListener.java
+++ b/mobile/android/tests/browser/junit3/src/harness/BrowserTestListener.java
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-package org.mozilla.gecko.browser.harness;
+package org.mozilla.gecko.harness;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;