diff --git a/.gitmodules b/.gitmodules
index a3775fc12d..78b75631ce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  # url = https://github.com/NOAA-EMC/fv3atm
+  # branch = develop
+  url = https://github.com/DusanJovic-NOAA/fv3atm
+  branch = fix_qr_tests
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
diff --git a/FV3 b/FV3
index 51e570cc93..3b318a6308 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 51e570cc9316911038c8a8f32c9d591ad317ee51
+Subproject commit 3b318a63083e43384af8f5d63fd5c110ed52b2a2
diff --git a/tests/rt.conf b/tests/rt.conf
index 832c5fd8ed..39c0871f56 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -182,7 +182,7 @@ COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D
 RUN | regional_spp_sppt_shum_skeb_dyn32_phy32           |                            | baseline |
 RUN | rap_control_dyn32_phy32                           |                            | baseline |
 RUN | hrrr_control_dyn32_phy32                          |                            | baseline |
-RUN | hrrr_control_qr_dyn32_phy32                       |                            | baseline |
+RUN | hrrr_control_qr_dyn32_phy32                       |                            |          |
 RUN | rap_2threads_dyn32_phy32                          |                            |          |
 RUN | hrrr_control_2threads_dyn32_phy32                 |                            |          |
 RUN | hrrr_control_decomp_dyn32_phy32                   |                            |          |
@@ -361,7 +361,7 @@ RUN | control_wam_debug                                 | + hera cheyenne
 COMPILE | rrfs_dyn32_phy32 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | + hera cheyenne | fv3 |
 RUN | rap_control_dyn32_phy32                           | + hera cheyenne            | baseline |
 RUN | hrrr_control_dyn32_phy32                          | + hera cheyenne            | baseline |
-RUN | hrrr_control_qr_dyn32_phy32                       | + hera cheyenne            | baseline |
+RUN | hrrr_control_qr_dyn32_phy32                       | + hera cheyenne            |          |
 RUN | rap_2threads_dyn32_phy32                          | + hera cheyenne            |          |
 RUN | hrrr_control_2threads_dyn32_phy32                 | + hera cheyenne            |          |
 RUN | hrrr_control_decomp_dyn32_phy32                   | + hera cheyenne            |          |
diff --git a/tests/tests/hrrr_control_qr_dyn32_phy32 b/tests/tests/hrrr_control_qr_dyn32_phy32
index a668bc2470..f0a0be8e34 100644
--- a/tests/tests/hrrr_control_qr_dyn32_phy32
+++ b/tests/tests/hrrr_control_qr_dyn32_phy32
@@ -6,7 +6,7 @@
 
 export TEST_DESCR="Compare HRRR CLM Lake results with previous trunk version"
 
-export CNTL_DIR=hrrr_control_qr_dyn32_phy32
+export CNTL_DIR=hrrr_control_dyn32_phy32
 
 export LIST_FILES="sfcf000.nc \
                    sfcf009.nc \
diff --git a/tests/tests/hrrr_control_restart_qr_dyn32_phy32 b/tests/tests/hrrr_control_restart_qr_dyn32_phy32
index 994c53593d..7d165400db 100644
--- a/tests/tests/hrrr_control_restart_qr_dyn32_phy32
+++ b/tests/tests/hrrr_control_restart_qr_dyn32_phy32
@@ -6,7 +6,7 @@
 
 export TEST_DESCR="Compare HRRR CLM Lake restart results with control"
 
-export CNTL_DIR=hrrr_control_qr_dyn32_phy32
+export CNTL_DIR=hrrr_control_dyn32_phy32
 
 export LIST_FILES="sfcf012.nc \
                    atmf012.nc \