diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index d537477..5d1177c 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -538,6 +538,10 @@
     // presets as well
     sf->intra_sf.skip_intra_in_interframe = 2;
 
+    sf->mv_sf.simple_motion_subpel_force_stop = HALF_PEL;
+
+    sf->tpl_sf.subpel_force_stop = HALF_PEL;
+
     sf->tx_sf.tx_type_search.enable_winner_mode_tx_type_pruning = 1;
     sf->tx_sf.tx_type_search.fast_intra_tx_type_search = 1;
     sf->tx_sf.tx_type_search.prune_mode = PRUNE_2D_MORE;
diff --git a/test/gf_pyr_height_test.cc b/test/gf_pyr_height_test.cc
index b1ade67..f153092 100644
--- a/test/gf_pyr_height_test.cc
+++ b/test/gf_pyr_height_test.cc
@@ -26,13 +26,13 @@
 } kTestParams[] = {
   // gf_min_pyr_height = 0
   { 0, 0, 33.40 },
-  { 0, 1, 34.00 },
+  { 0, 1, 33.90 },
   { 0, 2, 34.00 },
   { 0, 3, 34.20 },
   { 0, 4, 34.30 },
   { 0, 5, 34.40 },
   // gf_min_pyr_height = 1
-  { 1, 1, 34.00 },
+  { 1, 1, 33.90 },
   { 1, 2, 34.00 },
   { 1, 3, 34.20 },
   { 1, 4, 34.30 },