diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7fb97c81a60d84a7e3710f462f94f0f518f0fda7..74ec71552073da0011a0853c81cb93a57a0531d4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -37,5 +37,5 @@ manual.pdf: manual.xml
 	$(DBLATEX) manual.xml
 
 clean-local:
-	rm -f *~ *.pdf *.log *.aux
+	rm -f *~ *.pdf *.log *.aux *.out
 	rm -rf manual-html
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 26b1e11046e875ac954938bafc1b045aba9e2b6e..3ead5195123b6f9ba29d46bf5e484c89efee358c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,6 +53,11 @@ MODS = $(OCTAVE_MODS) \
 EXTRA_DIST = $(MODS) \
 	run_test_octave.m \
 	fs2000/fsdat.m \
+	test.m \
+	objectives \
+	ramst_initval_file_data.m \
+	homotopy/common.mod \
+	block_bytecode/fs2000_common.mod \
 	bvar_a_la_sims/bvar_sample.m
 
 TARGETS = check-matlab
@@ -76,9 +81,9 @@ check-matlab: $(MODS)
 
 clean-local:
 	rm -f $(patsubst %.mod, %.m, $(MODS)) \
-		$(patsubst %.mod, %_static.m, $(MODS)) \
+		$(patsubst %.mod, %_static.*, $(MODS)) \
 		$(patsubst %.mod, %_objective_static.m, $(MODS)) \
-		$(patsubst %.mod, %_dynamic.m, $(MODS))
+		$(patsubst %.mod, %_dynamic.*, $(MODS))
 
 	rm -f $(patsubst %.mod, %_results.mat, $(MODS)) \
 		$(patsubst %.mod, %_mode.mat, $(MODS)) \
@@ -87,6 +92,7 @@ clean-local:
 		$(patsubst %.mod, %_pindx.mat, $(MODS)) \
 		$(patsubst %.mod, %_params.mat, $(MODS)) \
 		$(patsubst %.mod, %.log, $(MODS))
+
 	rm -rf $(patsubst %.mod, %, $(MODS))
 
 	rm -f $(patsubst %.mod, %*.pdf, $(MODS)) \
@@ -98,6 +104,12 @@ clean-local:
 		$(shell find -name g3.mat) \
 		$(shell find -name H.dat)
 
-	rm -f arima/data1.m arima/data2.m
+	rm -f arima/data1.m arima/data2.m \
+		k_order_perturbation/*_simul \
+		k_order_perturbation/*.jnl \
+    k_order_perturbation/*.mat \
+		block_bytecode/fs2000_simk.swp
+
+	rm -rf ramsey_objective
 
 	rm -f $(shell find -name '*~')