diff --git a/tests/src/com/android/contacts/RunMethodInstrumentation.java b/tests/src/com/android/contacts/RunMethodInstrumentation.java
index 2eb6928..f7e3970 100644
--- a/tests/src/com/android/contacts/RunMethodInstrumentation.java
+++ b/tests/src/com/android/contacts/RunMethodInstrumentation.java
@@ -28,7 +28,9 @@
 /**
  * Runs a single static method specified via the arguments.
  *
- * Useful for manipulating the app state during manual testing.
+ * Useful for manipulating the app state during manual testing. If the class argument is omitted
+ * this class will attempt to invoke a method in
+ * {@link com.android.contacts.tests.AdbHelpers}
  *
  * Valid signatures: void f(Context, Bundle), void f(Context), void f()
  *
@@ -40,6 +42,8 @@
 
     private static final String TAG = "RunMethod";
 
+    private static final String DEFAULT_CLASS = "AdbHelpers";
+
     private String className;
     private String methodName;
     private Bundle args;
@@ -50,7 +54,8 @@
 
         InstrumentationRegistry.registerInstance(this, arguments);
 
-        className = arguments.getString("class");
+        className = arguments.getString("class", getContext().getPackageName() + "." +
+                DEFAULT_CLASS);
         methodName = arguments.getString("method");
         args = arguments;
 
diff --git a/tests/src/com/android/contacts/tests/AccountsTestHelper.java b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
index c25c3b4..22e288d 100644
--- a/tests/src/com/android/contacts/tests/AccountsTestHelper.java
+++ b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
@@ -108,50 +108,4 @@
     private AccountWithDataSet convertTestAccount() {
         return new AccountWithDataSet(mTestAccount.name, mTestAccount.type, null);
     }
-
-    /**
-     * Invoke from adb using the RunMethodInstrumentation:
-     * $ adb shell am instrument -e class com.android.contacts.tests.AccountTestHelper\
-     *   -e method addTestAccount -e accountName fooAccount\
-     *   -w com.google.android.contacts.tests/com.android.contacts.RunMethodInstrumentation
-     */
-    public static void addTestAccount(Context context, Bundle args) {
-        final String accountName = args.getString("name");
-        if (accountName == null) {
-            Log.e(TAG, "args must contain extra \"name\"");
-            return;
-        }
-
-        new AccountsTestHelper(context).addTestAccount(accountName);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
-    public static void removeTestAccount(Context context, Bundle args) {
-        final String accountName = args.getString("name");
-        if (accountName == null) {
-            Log.e(TAG, "args must contain extra \"name\"");
-            return;
-        }
-
-        final AccountWithDataSet account = new AccountWithDataSet(accountName, TEST_ACCOUNT_TYPE,
-                null);
-        new AccountsTestHelper(context).removeTestAccount(account);
-    }
-
-    public static void setDefaultAccount(Context context, Bundle args) {
-        final String name = args.getString("name");
-        final String type = args.getString("type");
-
-        if (name == null || type == null) {
-            Log.e(TAG, "args must contain extras \"name\" and \"type\"");
-            return;
-        }
-
-        new ContactsPreferences(context).setDefaultAccount(
-                new AccountWithDataSet(name, type, null));
-    }
-
-    public static void clearDefaultAccount(Context context) {
-        new ContactsPreferences(context).clearDefaultAccount();
-    }
 }
diff --git a/tests/src/com/android/contacts/tests/AdbHelpers.java b/tests/src/com/android/contacts/tests/AdbHelpers.java
new file mode 100644
index 0000000..c7e2188
--- /dev/null
+++ b/tests/src/com/android/contacts/tests/AdbHelpers.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+package com.android.contacts.tests;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.RequiresApi;
+import android.util.Log;
+
+import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.common.preference.ContactsPreferences;
+
+/**
+ * Contains utility methods that can be invoked directly from adb using RunMethodInstrumentation.
+ *
+ * Example usage:
+ * adb shell am instrument -e method addTestAccount -e accountName fooAccount\
+ *   -w com.android.contacts.tests/com.android.contacts.RunMethodInstrumentation
+ */
+public class AdbHelpers {
+    private static final String TAG = "AdbHelpers";
+
+    public static void addTestAccount(Context context, Bundle args) {
+        final String accountName = args.getString("name");
+        if (accountName == null) {
+            Log.e(TAG, "args must contain extra \"name\"");
+            return;
+        }
+
+        new AccountsTestHelper(context).addTestAccount(accountName);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
+    public static void removeTestAccount(Context context, Bundle args) {
+        final String accountName = args.getString("name");
+        if (accountName == null) {
+            Log.e(TAG, "args must contain extra \"name\"");
+            return;
+        }
+
+        final AccountWithDataSet account = new AccountWithDataSet(accountName,
+                AccountsTestHelper.TEST_ACCOUNT_TYPE, null);
+        new AccountsTestHelper(context).removeTestAccount(account);
+    }
+
+    public static void setDefaultAccount(Context context, Bundle args) {
+        final String name = args.getString("name");
+        final String type = args.getString("type");
+
+        if (name == null || type == null) {
+            Log.e(TAG, "args must contain extras \"name\" and \"type\"");
+            return;
+        }
+
+        new ContactsPreferences(context).setDefaultAccount(
+                new AccountWithDataSet(name, type, null));
+    }
+
+    public static void clearDefaultAccount(Context context) {
+        new ContactsPreferences(context).clearDefaultAccount();
+    }
+}