diff --git a/tests/Android.mk b/tests/Android.mk
index ef11c5e..4f43e4a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -8,7 +8,8 @@
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
 # Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    ../src/com/android/contacts/list/ContactsRequest.java
 
 LOCAL_PACKAGE_NAME := ContactsTests
 
diff --git a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
index bf75ed1..7543add 100644
--- a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
+++ b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
@@ -16,7 +16,6 @@
 
 package com.android.contacts.tests.allintents;
 
-import com.android.contacts.ContactsSearchManager;
 import com.android.contacts.list.ContactsRequest;
 import com.android.contacts.tests.R;
 import com.google.android.collect.Lists;
@@ -518,7 +517,7 @@
         intent.putExtra(UI.FILTER_TEXT_EXTRA_KEY, "A");
         ContactsRequest request = new ContactsRequest();
         request.setActionCode(actionCode);
-        intent.putExtra(ContactsSearchManager.ORIGINAL_REQUEST_KEY, request);
+        intent.putExtra("originalRequest", request);
         return intent;
     }