diff --git a/av1/encoder/segmentation.c b/av1/encoder/segmentation.c
index a49c2db72..7a954710b 100644
--- a/av1/encoder/segmentation.c
+++ b/av1/encoder/segmentation.c
@@ -276,12 +276,11 @@ void av1_choose_segmap_coding_method(AV1_COMMON *cm, MACROBLOCKD *xd) {
       const int count0 = temporal_predictor_count[i][0];
       const int count1 = temporal_predictor_count[i][1];
 
+      t_nopred_prob[i] = get_binary_prob(count0, count1);
 #if CONFIG_MISC_FIXES
       av1_prob_diff_update_savings_search(temporal_predictor_count[i],
                                           segp->pred_probs[i],
                                           &t_nopred_prob[i], DIFF_UPDATE_PROB);
-#else
-      t_nopred_prob[i] = get_binary_prob(count0, count1);
 #endif
 
       // Add in the predictor signaling cost
diff --git a/test/active_map_refresh_test.cc b/test/active_map_refresh_test.cc
index f4a0c294d..5ec598714 100644
--- a/test/active_map_refresh_test.cc
+++ b/test/active_map_refresh_test.cc
@@ -123,10 +123,7 @@ TEST_P(ActiveMapRefreshTest, Test) {
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
 }
 
-INSTANTIATE_TEST_CASE_P(
-    DISABLED_AV1, ActiveMapRefreshTest,
-    ::testing::Combine(
-        ::testing::Values(
-            static_cast<const libaom_test::CodecFactory *>(&libaom_test::kAV1)),
-        ::testing::Values(::libaom_test::kRealTime), ::testing::Range(5, 6)));
+AV1_INSTANTIATE_TEST_CASE(ActiveMapRefreshTest,
+                          ::testing::Values(::libaom_test::kRealTime),
+                          ::testing::Range(5, 6));
 }  // namespace
diff --git a/test/active_map_test.cc b/test/active_map_test.cc
index 39081aa54..42b45cc8b 100644
--- a/test/active_map_test.cc
+++ b/test/active_map_test.cc
@@ -81,10 +81,7 @@ TEST_P(ActiveMapTest, Test) {
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
 }
 
-INSTANTIATE_TEST_CASE_P(
-    DISABLED_AV1, ActiveMapTest,
-    ::testing::Combine(
-        ::testing::Values(
-            static_cast<const libaom_test::CodecFactory *>(&libaom_test::kAV1)),
-        ::testing::Values(::libaom_test::kRealTime), ::testing::Range(0, 6)));
+AV1_INSTANTIATE_TEST_CASE(ActiveMapTest,
+                          ::testing::Values(::libaom_test::kRealTime),
+                          ::testing::Range(0, 6));
 }  // namespace