diff --git a/Android.mk b/Android.mk
index e667cdb..93636da 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,10 +26,10 @@
 LOCAL_MODULE := tradefed
 
 LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := junit kxml2-2.3.0 jline-1.0
+LOCAL_STATIC_JAVA_LIBRARIES := junit kxml2-2.3.0 jline-1.0 tf-remote-client
 # emmalib is only a runtime dependency if generating code coverage reporters,
 # not a compile time dependency
-LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt emmalib tools-common-prebuilt tf-remote-client
+LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt emmalib tools-common-prebuilt
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
diff --git a/prod-tests/Android.mk b/prod-tests/Android.mk
index 124b2a0..01b4f5a 100644
--- a/prod-tests/Android.mk
+++ b/prod-tests/Android.mk
@@ -26,7 +26,7 @@
 LOCAL_MODULE := tf-prod-tests
 
 LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt tradefed loganalysis tf-remote-client
+LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt tradefed loganalysis
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
diff --git a/tests/Android.mk b/tests/Android.mk
index e39cc31..31f1748 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,7 +26,7 @@
 LOCAL_MODULE := tradefed-tests
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := easymock
-LOCAL_JAVA_LIBRARIES := tradefed ddmlib-prebuilt tf-remote-client
+LOCAL_JAVA_LIBRARIES := tradefed ddmlib-prebuilt
 
 include $(BUILD_HOST_JAVA_LIBRARY)