diff --git a/tests/.gitignore b/tests/.gitignore
index daf2dd3c2..f374b4b02 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -18,6 +18,7 @@
 *_simul
 *-macroexp.mod
 *.json
+*.dump
 
 wsOct
 /run_test_octave_output.txt
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 77b32434c..4f9b3540c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -133,6 +133,7 @@ MODFILES = \
 	k_order_perturbation/fs2000k_1_m.mod \
 	k_order_perturbation/fs2000k3_m.mod \
 	k_order_perturbation/fs2000k3_p.mod \
+	k_order_perturbation/fs2000k4.mod \
 	partial_information/PItest3aHc0PCLsimModPiYrVarobsAll.mod \
 	partial_information/PItest3aHc0PCLsimModPiYrVarobsCNR.mod \
 	arima/mod1.mod \
@@ -395,12 +396,15 @@ estimation/MH_recover/fs2000_recover_tarb.o.trs: estimation/MH_recover/fs2000_re
 k_order_perturbation/fs2000k_1_m.m.trs: k_order_perturbation/fs2000k2_m.m.trs
 k_order_perturbation/fs2000k2_m.m.trs k_order_perturbation/fs2000k3_m.m.trs k_order_perturbation/fs2000k2_use_dll.m.trs k_order_perturbation/fs2000k3_use_dll.m.trs: k_order_perturbation/fs2000k2a.m.trs
 k_order_perturbation/fs2000k_1_use_dll.m.trs: k_order_perturbation/fs2000k2_use_dll.m.trs
-k_order_perturbation/fs2000k4.m.trs: k_order_perturbation/fs2000k++.m.trs
+k_order_perturbation/fs2000k4.m.trs: k_order_perturbation/fs2000k++.mat
 
 k_order_perturbation/fs2000k_1_m.o.trs: k_order_perturbation/fs2000k2_m.o.trs
 k_order_perturbation/fs2000k2_m.o.trs k_order_perturbation/fs2000k3_m.o.trs k_order_perturbation/fs2000k2_use_dll.o.trs k_order_perturbation/fs2000k3_use_dll.o.trs: k_order_perturbation/fs2000k2a.o.trs
 k_order_perturbation/fs2000k_1_use_dll.o.trs: k_order_perturbation/fs2000k2_use_dll.o.trs
-k_order_perturbation/fs2000k4.o.trs: k_order_perturbation/fs2000k++.o.trs
+k_order_perturbation/fs2000k4.o.trs: k_order_perturbation/fs2000k++.mat
+
+k_order_perturbation/fs2000k++.mat: k_order_perturbation/fs2000k++.mod ../dynare++/src/dynare++$(EXEEXT)
+	cd k_order_perturbation && ../../dynare++/src/dynare++ --order 3 --no-centralize fs2000k++.mod
 
 kalman_filter_smoother/algo1.m.trs kalman_filter_smoother/algo3.m.trs kalman_filter_smoother/algo4a.m.trs kalman_filter_smoother/algo4b.m.trs kalman_filter_smoother/algoH1.m.trs kalman_filter_smoother/algoH3.m.trs kalman_filter_smoother/fs2000.m.trs kalman_filter_smoother/fs2000_1.m.trs kalman_filter_smoother/fs2000_2.m.trs kalman_filter_smoother/fs2000a.m.trs: kalman_filter_smoother/gen_data.m.trs
 kalman_filter_smoother/algo1.o.trs kalman_filter_smoother/algo3.o.trs kalman_filter_smoother/algo4a.o.trs kalman_filter_smoother/algo4b.o.trs kalman_filter_smoother/algoH1.o.trs kalman_filter_smoother/algoH3.o.trs kalman_filter_smoother/fs2000.o.trs kalman_filter_smoother/fs2000_1.o.trs kalman_filter_smoother/fs2000_2.o.trs kalman_filter_smoother/fs2000a.o.trs: kalman_filter_smoother/gen_data.o.trs
@@ -795,7 +799,6 @@ EXTRA_DIST = \
 	gsa/morris/nk_est_data.m \
 	analytic_derivatives/fsdat_simul.m \
 	fs2000/fsdat_simul.m \
-	k_order_perturbation/run_fs2000kplusplus.m \
 	ls2003/data_ca1.m \
 	measurement_errors/data_ca1.m \
 	measurement_errors/fs2000_corr_me_ml_mcmc/fsdat_simul.m \
@@ -1011,6 +1014,10 @@ clean-local:
 
 	rm -f loglinear/results_exp_histval.mat loglinear/results_exp.mat
 
+	rm -f k_order_perturbation/fs2000k++.mat k_order_perturbation/fs2000k++.dump \
+		k_order_perturbation/fs2000k++.jnl k_order_perturbation/fs2000k++_f.m \
+		k_order_perturbation/fs2000k++_ff.m
+
 	find . -name "*.tex" -type f -delete
 	find . -name "*.aux" -type f -delete
 	find . -name "*.log" -type f -delete
diff --git a/tests/k_order_perturbation/run_fs2000kplusplus.m b/tests/k_order_perturbation/run_fs2000kplusplus.m
deleted file mode 100644
index 3f22680b1..000000000
--- a/tests/k_order_perturbation/run_fs2000kplusplus.m
+++ /dev/null
@@ -1 +0,0 @@
-system('../../dynare++/src/dynare++ --order 3 --no-centralize fs2000k++.mod')