diff --git a/test/active_map_refresh_test.cc b/test/active_map_refresh_test.cc
index c94566143..83d244354 100644
--- a/test/active_map_refresh_test.cc
+++ b/test/active_map_refresh_test.cc
@@ -124,4 +124,12 @@ TEST_P(ActiveMapRefreshTest, Test) {
 VP9_INSTANTIATE_TEST_CASE(ActiveMapRefreshTest,
                           ::testing::Values(::libvpx_test::kRealTime),
                           ::testing::Range(5, 6));
+#if CONFIG_VP10
+INSTANTIATE_TEST_CASE_P(
+    DISABLED_VP10, ActiveMapRefreshTest,
+    ::testing::Combine(
+        ::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
+            &libvpx_test::kVP10)),
+        ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(5, 6)));
+#endif  // CONFIG_VP10
 }  // namespace
diff --git a/test/active_map_test.cc b/test/active_map_test.cc
index dc3de7213..3583061fd 100644
--- a/test/active_map_test.cc
+++ b/test/active_map_test.cc
@@ -86,4 +86,12 @@ TEST_P(ActiveMapTest, Test) {
 VP9_INSTANTIATE_TEST_CASE(ActiveMapTest,
                           ::testing::Values(::libvpx_test::kRealTime),
                           ::testing::Range(0, 9));
+#if CONFIG_VP10
+INSTANTIATE_TEST_CASE_P(
+    DISABLED_VP10, ActiveMapTest,
+    ::testing::Combine(
+        ::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
+            &libvpx_test::kVP10)),
+        ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(0, 9)));
+#endif  // CONFIG_VP10
 }  // namespace
diff --git a/test/test.mk b/test/test.mk
index 71adbff79..8682a885f 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -38,8 +38,6 @@ LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += external_frame_buffer_test.cc
 LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += invalid_file_test.cc
 LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += user_priv_test.cc
 LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += vp9_frame_parallel_test.cc
-LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += active_map_refresh_test.cc
-LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += active_map_test.cc
 LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += borders_test.cc
 LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += cpu_speed_test.cc
 LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += frame_size_tests.cc
@@ -87,6 +85,12 @@ ifeq ($(CONFIG_ENCODE_PERF_TESTS)$(CONFIG_VP9_ENCODER), yesyes)
 LIBVPX_TEST_SRCS-yes += encode_perf_test.cc
 endif
 
+## Multi-codec / unconditional whitebox tests.
+ifeq ($(findstring yes,$(CONFIG_VP9_ENCODER)$(CONFIG_VP10_ENCODER)),yes)
+LIBVPX_TEST_SRCS-yes += active_map_refresh_test.cc
+LIBVPX_TEST_SRCS-yes += active_map_test.cc
+endif
+
 ##
 ## WHITE BOX TESTS
 ##