diff --git a/configure.ac b/configure.ac
index bc8166d3e916fc3c78c41f8d53f309990bb28eb7..140b84feb759ef727f5b88d2c15d87041d905248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,7 @@ AC_CONFIG_FILES([Makefile
dynare++/integ/testing/Makefile
dynare++/kord/Makefile
dynare++/src/Makefile
+ dynare++/tests/Makefile
mex/sources/Makefile
])
diff --git a/dynare++/Makefile.am b/dynare++/Makefile.am
index eb2f14765b27223ac127528116e40384335f1315..36d74d5ce2e27fbdeb6e31c52c636f89e27100f9 100644
--- a/dynare++/Makefile.am
+++ b/dynare++/Makefile.am
@@ -1,3 +1 @@
-SUBDIRS = utils/cc sylv parser/cc tl doc integ kord src
-
-EXTRA_DIST = tests
+SUBDIRS = utils/cc sylv parser/cc tl doc integ kord src tests
diff --git a/dynare++/tests/Makefile.am b/dynare++/tests/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..e98e408637a5ee497d19c07d1c0f2bd0e6eca6f8
--- /dev/null
+++ b/dynare++/tests/Makefile.am
@@ -0,0 +1,46 @@
+MODFILES = \
+ asset.mod \
+ c20.mod \
+ czech2.mod \
+ dm7.mod \
+ example1.mod \
+ example1_optim.mod \
+ gentay1a.mod \
+ judd.mod \
+ judd_norm.mod \
+ kp1980_1.mod \
+ kp1980_2.mod \
+ kp1980_3.mod \
+ lucas78.mod \
+ m_0_3_0_0_0_0_0_0.mod \
+ m_1_3_0_0_0_0_0_0.mod \
+ m_1_3_0_0_0_0_0_1.mod \
+ or0a.mod \
+ portfolio4.mod \
+ portfolio4_norm.mod \
+ portfolio.mod \
+ psd_exo3.mod \
+ q3a2.mod \
+ q3a50.mod \
+ sedmodel1.mod \
+ swma_pie.mod \
+ test1.mod \
+ test2a.mod \
+ test2.mod \
+ test3.mod \
+ test4.mod \
+ test5.mod \
+ test6.mod \
+ test7.mod \
+ test.mod
+
+EXTRA_DIST = $(MODFILES) \
+ sw_euro.mod # This one crashes at steady state computation
+
+check-local: $(MODFILES:%.mod=%.jnl)
+
+%.jnl: %.mod
+ ../src/dynare++ --sim 2 $<
+
+clean-local:
+ rm -f *.jnl *_f.m *_ff.m *.dump
diff --git a/dynare++/tests/q3a50.mod b/dynare++/tests/q3a50.mod
index f573caea23529af74511cb48548177809e0c6676..df2fe4c6ef9e1f93d0afa25ec11c9ddd63acbccb 100644
--- a/dynare++/tests/q3a50.mod
+++ b/dynare++/tests/q3a50.mod
@@ -1,4 +1,3 @@
-periods 5000;
var c,a1,k1,a2,k2,a3,k3,a4,k4,a5,k5,a6,k6,a7,k7,a8,k8,a9,k9,a10,k10,a11,k11,a12,k12,a13,k13,a14,k14,a15,k15,a16,k16,a17,k17,a18,k18,a19,k19,a20,k20,a21,k21,a22,k22,a23,k23,a24,k24,a25,k25,a26,k26,a27,k27,a28,k28,a29,k29,a30,k30,a31,k31,a32,k32,a33,k33,a34,k34,a35,k35,a36,k36,a37,k37,a38,k38,a39,k39,a40,k40,a41,k41,a42,k42,a43,k43,a44,k44,a45,k45,a46,k46,a47,k47,a48,k48,a49,k49,a50,k50;
varexo e,e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15,e16,e17,e18,e19,e20,e21,e22,e23,e24,e25,e26,e27,e28,e29,e30,e31,e32,e33,e34,e35,e36,e37,e38,e39,e40,e41,e42,e43,e44,e45,e46,e47,e48,e49,e50;
parameters beta, gamma, phi, delta, alpha, rho, zeta, sigma, N;
@@ -322,4 +321,4 @@ vcov = [
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0;
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1];
-order = 2;
\ No newline at end of file
+order = 2;