diff --git a/Common/src/geometry/CGeometry.cpp b/Common/src/geometry/CGeometry.cpp
index 0bd1a4bf8eef..ed853fb16619 100644
--- a/Common/src/geometry/CGeometry.cpp
+++ b/Common/src/geometry/CGeometry.cpp
@@ -4074,7 +4074,8 @@ su2double NearestNeighborDistance(CGeometry* geometry, const CConfig* config, co
   const su2double max = std::numeric_limits<su2double>::max();
   su2double distance = max;
   for (const auto jPoint : geometry->nodes->GetPoints(iPoint)) {
-    const su2double dist = geometry->nodes->GetWall_Distance(jPoint);
+    const su2double dist =
+        geometry->nodes->GetViscousBoundary(jPoint) ? 0.0 : geometry->nodes->GetWall_Distance(jPoint);
     if (dist > EPS) distance = fmin(distance, dist);
   }
   if (distance > 0 && distance < max) return distance;
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
index 4a27a3c5d6e1..d5e6ec2bf54c 100644
--- a/TestCases/parallel_regression.py
+++ b/TestCases/parallel_regression.py
@@ -397,7 +397,7 @@ def main():
     turb_flatplate_CC_Wilcox.cfg_dir   = "rans/flatplate"
     turb_flatplate_CC_Wilcox.cfg_file  = "turb_SST_flatplate_compressibility_Wilcox.cfg"
     turb_flatplate_CC_Wilcox.test_iter = 20
-    turb_flatplate_CC_Wilcox.test_vals = [-1.280875, 1.974210, 1.440441, 5.038396, -3.791318, 11.809748]
+    turb_flatplate_CC_Wilcox.test_vals = [-1.280875, 1.974210, 1.440441, 5.038396, -3.791093, 8.297424]
     test_list.append(turb_flatplate_CC_Wilcox)
 
     # Flat plate SST compressibility correction Sarkar
@@ -405,7 +405,7 @@ def main():
     turb_flatplate_CC_Sarkar.cfg_dir   = "rans/flatplate"
     turb_flatplate_CC_Sarkar.cfg_file  = "turb_SST_flatplate_compressibility_Sarkar.cfg"
     turb_flatplate_CC_Sarkar.test_iter = 20
-    turb_flatplate_CC_Sarkar.test_vals = [-1.280875, 1.974210, 1.440441, 5.038396, -3.791321, 11.809748]
+    turb_flatplate_CC_Sarkar.test_vals = [-1.280875, 1.974210, 1.440441, 5.038396, -3.791096, 8.297424]
     test_list.append(turb_flatplate_CC_Sarkar)
 
     # ONERA M6 Wing
diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py
index 0fad5dd9d8cf..2efb33e5c49e 100644
--- a/TestCases/tutorials.py
+++ b/TestCases/tutorials.py
@@ -236,7 +236,7 @@ def main():
     tutorial_trans_flatplate_T3A.cfg_dir    = "../Tutorials/compressible_flow/Transitional_Flat_Plate/Langtry_and_Menter/T3A"
     tutorial_trans_flatplate_T3A.cfg_file   = "transitional_LM_model_ConfigFile.cfg"
     tutorial_trans_flatplate_T3A.test_iter  = 20
-    tutorial_trans_flatplate_T3A.test_vals  = [-5.841218, -2.094611, -3.947011, -0.305590, -1.586230, 8.296809, -3.507308, 0.394898]
+    tutorial_trans_flatplate_T3A.test_vals  = [-5.837370, -2.092243, -3.983811, -0.302357, -1.937550, 1.768072, -3.496905, 0.391385]
     tutorial_trans_flatplate_T3A.test_vals_aarch64 = [-5.837368, -2.092246, -3.984172, -0.302357, -1.928108, 1.667157, -3.496279, 0.391610]
     tutorial_trans_flatplate_T3A.no_restart = True
     test_list.append(tutorial_trans_flatplate_T3A)
@@ -246,7 +246,7 @@ def main():
     tutorial_trans_flatplate_T3Am.cfg_dir    = "../Tutorials/compressible_flow/Transitional_Flat_Plate/Langtry_and_Menter/T3A-"
     tutorial_trans_flatplate_T3Am.cfg_file   = "transitional_LM_model_ConfigFile.cfg"
     tutorial_trans_flatplate_T3Am.test_iter  = 20
-    tutorial_trans_flatplate_T3Am.test_vals  = [-6.206421, -2.029271, -4.028227, -0.685277, -3.893712, 6.692342, -2.521007, 0.948646]
+    tutorial_trans_flatplate_T3Am.test_vals  = [-6.063710, -1.945074, -3.946905, -0.549154, -3.863803, 2.662907, -2.517658, 1.112973]
     tutorial_trans_flatplate_T3Am.test_vals_aarch64 = [-6.063726, -1.945088, -3.946923, -0.549166, -3.863794, 2.664439, -2.517601, 1.112978]
     tutorial_trans_flatplate_T3Am.no_restart = True
     test_list.append(tutorial_trans_flatplate_T3Am)
diff --git a/TestCases/vandv.py b/TestCases/vandv.py
index 1978292f7481..540c6e494225 100644
--- a/TestCases/vandv.py
+++ b/TestCases/vandv.py
@@ -63,8 +63,8 @@ def main():
     bump_sst1994m.cfg_dir   = "vandv/rans/bump_in_channel"
     bump_sst1994m.cfg_file  = "turb_bump_sst.cfg"
     bump_sst1994m.test_iter = 5
-    bump_sst1994m.test_vals         = [-13.006002, -10.671005, -10.602936, -7.625336, -10.992230, -0.224690, 0.004900]
-    bump_sst1994m.test_vals_aarch64 = [-13.006002, -10.671005, -10.602936, -7.625336, -10.992230, -0.224690, 0.004900]
+    bump_sst1994m.test_vals         = [-13.025265, -10.669816, -10.615338, -7.577125, -10.709448, -5.453868, 0.004903]
+    bump_sst1994m.test_vals_aarch64 = [-13.025265, -10.669816, -10.615338, -7.577125, -10.709448, -5.453868, 0.004903]
     test_list.append(bump_sst1994m)
 
     # SWBLI SA