diff --git a/tests/observation_trends_and_prefiltering/Trend_diagnostics_ML_common.inc b/tests/observation_trends_and_prefiltering/Trend_diagnostics_ML_common.inc
index dca528e27..66f6ee911 100644
--- a/tests/observation_trends_and_prefiltering/Trend_diagnostics_ML_common.inc
+++ b/tests/observation_trends_and_prefiltering/Trend_diagnostics_ML_common.inc
@@ -25,11 +25,15 @@ if abs(corr(oo_.FilteredVariables.Y_obs(2:end-1)-Y_obs(3:end)',oo_.FilteredVaria
     error('Filtered Variables are wrong')
 end
    
-if max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,1,2:end-(options_.nk-1)))-oo_.FilteredVariables.Y_obs))>1e-5 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,2,2:end-(options_.nk-1)))-oo_.FilteredVariables.P_obs))>1e-5 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,3,2:end-(options_.nk-1)))-oo_.FilteredVariables.junk2))>1e-5 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,1,3:end-options_.nk))-oo_.FilteredVariables.Y_obs(3:end)))>1e-2 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,2,3:end-options_.nk))-oo_.FilteredVariables.P_obs(3:end)))>1e-2 ||...
+Y_pos=strmatch('Y_obs',M_.endo_names,'exact');
+P_pos=strmatch('P_obs',M_.endo_names,'exact');
+junk2_pos=strmatch('junk2',M_.endo_names,'exact');
+
+if max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,Y_pos,2:end-(options_.nk-1)))-oo_.FilteredVariables.Y_obs))>1e-5 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,P_pos,2:end-(options_.nk-1)))-oo_.FilteredVariables.P_obs))>1e-5 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,junk2_pos,2:end-(options_.nk-1)))-oo_.FilteredVariables.junk2))>1e-5 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,Y_pos,3:end-options_.nk))-oo_.FilteredVariables.Y_obs(3:end)))>1e-2 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,P_pos,3:end-options_.nk))-oo_.FilteredVariables.P_obs(3:end)))>1e-2 ||...
     mean(squeeze(oo_.FilteredVariablesKStepAhead(2,3,3:end-options_.nk)))>1e-1 ||...
     mean(squeeze(oo_.FilteredVariablesKStepAhead(2,4,3:end-options_.nk)))>1e-1
     error('FilteredVariablesKStepAhead is wrong')
diff --git a/tests/observation_trends_and_prefiltering/Trend_diagnostics_calib_common.inc b/tests/observation_trends_and_prefiltering/Trend_diagnostics_calib_common.inc
index 2a7af6878..d5384ff9f 100644
--- a/tests/observation_trends_and_prefiltering/Trend_diagnostics_calib_common.inc
+++ b/tests/observation_trends_and_prefiltering/Trend_diagnostics_calib_common.inc
@@ -21,11 +21,15 @@ if abs(corr(oo_.FilteredVariables.Y_obs(2:end-1)-Y_obs(3:end)',oo_.FilteredVaria
     error('Filtered Variables are wrong')
 end
    
-if max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,1,2:end-(options_.nk-1)))-oo_.FilteredVariables.Y_obs))>1e-5 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,2,2:end-(options_.nk-1)))-oo_.FilteredVariables.P_obs))>1e-5 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,3,2:end-(options_.nk-1)))-oo_.FilteredVariables.junk2))>1e-5 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,1,3:end-options_.nk))-oo_.FilteredVariables.Y_obs(3:end)))>1e-2 ||...
-    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,2,3:end-options_.nk))-oo_.FilteredVariables.P_obs(3:end)))>1e-2 ||...
+Y_pos=strmatch('Y_obs',M_.endo_names,'exact');
+P_pos=strmatch('P_obs',M_.endo_names,'exact');
+junk2_pos=strmatch('junk2',M_.endo_names,'exact');
+
+if max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,Y_pos,2:end-(options_.nk-1)))-oo_.FilteredVariables.Y_obs))>1e-5 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,P_pos,2:end-(options_.nk-1)))-oo_.FilteredVariables.P_obs))>1e-5 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(1,junk2_pos,2:end-(options_.nk-1)))-oo_.FilteredVariables.junk2))>1e-5 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,Y_pos,3:end-options_.nk))-oo_.FilteredVariables.Y_obs(3:end)))>1e-2 ||...
+    max(abs(squeeze(oo_.FilteredVariablesKStepAhead(2,P_pos,3:end-options_.nk))-oo_.FilteredVariables.P_obs(3:end)))>1e-2 ||...
     mean(squeeze(oo_.FilteredVariablesKStepAhead(2,3,3:end-options_.nk)))>1e-1 ||...
     mean(squeeze(oo_.FilteredVariablesKStepAhead(2,4,3:end-options_.nk)))>1e-1
     error('FilteredVariablesKStepAhead is wrong')