diff --git a/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java b/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java
index 446196b25..caf8b02df 100644
--- a/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java
+++ b/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java
@@ -105,7 +105,7 @@ public class MessageComposeInstrumentationTests
     private static final String ACTION_EDIT_DRAFT = "com.android.email.intent.action.EDIT_DRAFT";
 
     public MessageComposeInstrumentationTests() {
-        super("com.android.email", MessageCompose.class);
+        super(MessageCompose.class);
     }
 
     /*
diff --git a/tests/src/com/android/email/activity/MessageListUnitTests.java b/tests/src/com/android/email/activity/MessageListUnitTests.java
index 38be793a7..17139014c 100644
--- a/tests/src/com/android/email/activity/MessageListUnitTests.java
+++ b/tests/src/com/android/email/activity/MessageListUnitTests.java
@@ -56,7 +56,7 @@ public class MessageListUnitTests
     private ArrayList<Long> mIDarray;
 
     public MessageListUnitTests() {
-        super("com.android.email", MessageList.class);
+        super(MessageList.class);
     }
 
     @Override
diff --git a/tests/src/com/android/email/activity/MessageViewTests.java b/tests/src/com/android/email/activity/MessageViewTests.java
index c13162488..8a3611f99 100644
--- a/tests/src/com/android/email/activity/MessageViewTests.java
+++ b/tests/src/com/android/email/activity/MessageViewTests.java
@@ -58,7 +58,7 @@ public class MessageViewTests
     private Context mContext;
     
     public MessageViewTests() {
-        super("com.android.email", MessageView.class);
+        super(MessageView.class);
     }
 
     @Override
diff --git a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java b/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
index a4cc32f7c..b96874776 100644
--- a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
@@ -47,7 +47,7 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
     private static final String PREFERENCE_FREQUENCY = "account_check_frequency";
 
     public AccountSettingsTests() {
-        super("com.android.email", AccountSettings.class);
+        super(AccountSettings.class);
     }
 
     /**
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java b/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java
index d64ff10aa..5ca1b787b 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java
@@ -46,7 +46,7 @@ public class AccountSetupExchangeTests extends
     //EXCHANGE-REMOVE-SECTION-END
 
     public AccountSetupExchangeTests() {
-        super("com.android.email", AccountSetupExchange.class);
+        super(AccountSetupExchange.class);
     }
 
     //EXCHANGE-REMOVE-SECTION-START
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java
index 0652813ad..96753f489 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java
@@ -41,7 +41,7 @@ public class AccountSetupIncomingTests extends
     private Button mNextButton;
     
     public AccountSetupIncomingTests() {
-        super("com.android.email", AccountSetupIncoming.class);
+        super(AccountSetupIncoming.class);
     }
 
     /**
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupNamesTests.java b/tests/src/com/android/email/activity/setup/AccountSetupNamesTests.java
index 3e3fb207a..758223db8 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupNamesTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupNamesTests.java
@@ -44,7 +44,7 @@ public class AccountSetupNamesTests extends ActivityInstrumentationTestCase2<Acc
     private Button mDoneButton;
     
     public AccountSetupNamesTests() {
-        super("com.android.email", AccountSetupNames.class);
+        super(AccountSetupNames.class);
     }
 
     /**
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
index 2991cee4c..5e6cdcbf7 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
@@ -40,7 +40,7 @@ public class AccountSetupOptionsTests
     private Spinner mCheckFrequencyView;
     
     public AccountSetupOptionsTests() {
-        super("com.android.email", AccountSetupOptions.class);
+        super(AccountSetupOptions.class);
     }
 
     /**
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
index b603c8324..d1f0a0a46 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
@@ -38,7 +38,7 @@ public class AccountSetupOutgoingTests extends
     private Button mNextButton;
     
     public AccountSetupOutgoingTests() {
-        super("com.android.email", AccountSetupOutgoing.class);
+        super(AccountSetupOutgoing.class);
     }
 
     /**