diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 702ac9e..1339bc1 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -641,7 +641,6 @@
 
   if (speed >= 6) {
     sf->optimize_coefficients = NO_TRELLIS_OPT;
-    sf->mv.search_method = HEX;
     for (int i = 0; i < TX_SIZES; ++i) {
       sf->intra_y_mode_mask[i] = INTRA_DC;
       sf->intra_uv_mode_mask[i] = UV_INTRA_DC_CFL;
@@ -668,6 +667,7 @@
     sf->max_intra_bsize = BLOCK_16X16;
     sf->use_inter_txb_hash = 0;
     sf->skip_interp_filter_search = 1;
+    sf->adaptive_mode_search = 2;
 #if 0
     // Turning this off until we agree that tradeoff qualuty vs speed is good.
     sf->force_tx_search_off = 1;
diff --git a/test/rt_end_to_end_test.cc b/test/rt_end_to_end_test.cc
index e586849..dd84f60 100644
--- a/test/rt_end_to_end_test.cc
+++ b/test/rt_end_to_end_test.cc
@@ -35,7 +35,7 @@
                            { 7, { { 0, 34.9 }, { 3, 35.8 } } },
                            { 8, { { 0, 35.0 }, { 3, 36.0 } } } } },
                        { "paris_352_288_30.y4m",
-                         { { 6, { { 0, 36.4 }, { 3, 36.7 } } },
+                         { { 6, { { 0, 36.3 }, { 3, 36.7 } } },
                            { 7, { { 0, 35.5 }, { 3, 36.0 } } },
                            { 8, { { 0, 36.0 }, { 3, 36.5 } } } } },
                        { "niklas_1280_720_30.y4m",