diff --git a/samples/ApiDemos/tests/Android.mk b/samples/ApiDemos/tests/Android.mk
index f975662dc..ed661a002 100644
--- a/samples/ApiDemos/tests/Android.mk
+++ b/samples/ApiDemos/tests/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/samples/BrokenKeyDerivation/tests/Android.mk b/samples/BrokenKeyDerivation/tests/Android.mk
index fc161a9b0..bee91426b 100644
--- a/samples/BrokenKeyDerivation/tests/Android.mk
+++ b/samples/BrokenKeyDerivation/tests/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 LOCAL_PACKAGE_NAME := BrokenKeyDerivationTests
 
 LOCAL_MODULE_TAGS := tests
diff --git a/samples/HelloActivity/tests/Android.mk b/samples/HelloActivity/tests/Android.mk
index b4a0157cf..bd084f8c7 100644
--- a/samples/HelloActivity/tests/Android.mk
+++ b/samples/HelloActivity/tests/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 LOCAL_PACKAGE_NAME := HelloActivityTests
 
 LOCAL_MODULE_TAGS := tests
diff --git a/samples/LunarLander/tests/Android.mk b/samples/LunarLander/tests/Android.mk
index 08e66f0a0..1b682526e 100644
--- a/samples/LunarLander/tests/Android.mk
+++ b/samples/LunarLander/tests/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 LOCAL_PACKAGE_NAME := LunarLanderTests
 
 LOCAL_MODULE_TAGS := tests
diff --git a/samples/SkeletonApp/tests/Android.mk b/samples/SkeletonApp/tests/Android.mk
index d466423d6..1d52576df 100644
--- a/samples/SkeletonApp/tests/Android.mk
+++ b/samples/SkeletonApp/tests/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 LOCAL_PACKAGE_NAME := SkeletonAppTests
 
 LOCAL_MODULE_TAGS := tests
diff --git a/samples/Snake/tests/Android.mk b/samples/Snake/tests/Android.mk
index 1d3677afb..945f10438 100644
--- a/samples/Snake/tests/Android.mk
+++ b/samples/Snake/tests/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 LOCAL_PACKAGE_NAME := SnakeTests
 
 LOCAL_MODULE_TAGS := tests
diff --git a/samples/Vault/Android.mk b/samples/Vault/Android.mk
index 56957ee60..46a873e75 100644
--- a/samples/Vault/Android.mk
+++ b/samples/Vault/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 LOCAL_SDK_VERSION := current
 
 LOCAL_PROGUARD_ENABLED := disabled