diff --git a/regtest/README b/regtest/README
index 94efffe49f..ca5dce1aed 100644
--- a/regtest/README
+++ b/regtest/README
@@ -12,8 +12,8 @@ HOW TO ADD A NEW TEST
 Add a new directory rtXXX, let's say rt105, and go there:
 > cd rt105
 
-Link the common makefile
-> ln -s ../scripts/test.make ./Makefile
+Put a standard makefile there:
+> echo "include ../scripts/test.make" > rt105/Makefile
 
 Put in the rt105 directory a "config" files containing the
 options which define your test.
diff --git a/regtest/rt-mpi0/Makefile b/regtest/rt-mpi0/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt-mpi0/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt-mpi0/Makefile b/regtest/rt-mpi0/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt-mpi0/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-mpi1/Makefile b/regtest/rt-mpi1/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt-mpi1/Makefile
+++ b/regtest/rt-mpi1/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt-mpi2/Makefile b/regtest/rt-mpi2/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt-mpi2/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt-mpi2/Makefile b/regtest/rt-mpi2/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt-mpi2/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-mpi3/Makefile b/regtest/rt-mpi3/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt-mpi3/Makefile
+++ b/regtest/rt-mpi3/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt-simplemd0/Makefile b/regtest/rt-simplemd0/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt-simplemd0/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt-simplemd0/Makefile b/regtest/rt-simplemd0/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt-simplemd0/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-simplemd1/Makefile b/regtest/rt-simplemd1/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt-simplemd1/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt-simplemd1/Makefile b/regtest/rt-simplemd1/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt-simplemd1/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-simplemd2/Makefile b/regtest/rt-simplemd2/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt-simplemd2/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt-simplemd2/Makefile b/regtest/rt-simplemd2/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt-simplemd2/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-tg1/Makefile b/regtest/rt-tg1/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt-tg1/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt-tg1/Makefile b/regtest/rt-tg1/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt-tg1/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt0/Makefile b/regtest/rt0/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt0/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt0/Makefile b/regtest/rt0/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt0/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt1/Makefile b/regtest/rt1/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt1/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt1/Makefile b/regtest/rt1/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt1/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt10-mpi/Makefile b/regtest/rt10-mpi/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt10-mpi/Makefile
+++ b/regtest/rt10-mpi/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt10-restart/Makefile b/regtest/rt10-restart/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt10-restart/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt10-restart/Makefile b/regtest/rt10-restart/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt10-restart/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt10/Makefile b/regtest/rt10/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt10/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt10/Makefile b/regtest/rt10/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt10/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt11-mpi/Makefile b/regtest/rt11-mpi/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt11-mpi/Makefile
+++ b/regtest/rt11-mpi/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt11/Makefile b/regtest/rt11/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt11/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt11/Makefile b/regtest/rt11/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt11/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt12/Makefile b/regtest/rt12/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt12/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt12/Makefile b/regtest/rt12/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt12/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt14/Makefile b/regtest/rt14/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt14/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt14/Makefile b/regtest/rt14/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt14/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt15/Makefile b/regtest/rt15/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt15/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt15/Makefile b/regtest/rt15/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt15/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt16/Makefile b/regtest/rt16/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt16/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt16/Makefile b/regtest/rt16/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt16/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt17/Makefile b/regtest/rt17/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt17/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt17/Makefile b/regtest/rt17/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt17/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt18/Makefile b/regtest/rt18/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt18/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt18/Makefile b/regtest/rt18/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt18/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt19-mpi/Makefile b/regtest/rt19-mpi/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt19-mpi/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt19-mpi/Makefile b/regtest/rt19-mpi/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt19-mpi/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt19/Makefile b/regtest/rt19/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt19/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt19/Makefile b/regtest/rt19/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt19/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt2/Makefile b/regtest/rt2/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt2/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt2/Makefile b/regtest/rt2/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt2/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt20-mpi/Makefile b/regtest/rt20-mpi/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt20-mpi/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt20-mpi/Makefile b/regtest/rt20-mpi/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt20-mpi/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt20/Makefile b/regtest/rt20/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt20/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt20/Makefile b/regtest/rt20/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt20/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt21/Makefile b/regtest/rt21/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt21/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt21/Makefile b/regtest/rt21/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt21/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt22/Makefile b/regtest/rt22/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt22/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt22/Makefile b/regtest/rt22/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt22/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt24/Makefile b/regtest/rt24/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt24/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt24/Makefile b/regtest/rt24/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt24/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt26/Makefile b/regtest/rt26/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt26/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt26/Makefile b/regtest/rt26/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt26/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt27/Makefile b/regtest/rt27/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt27/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt27/Makefile b/regtest/rt27/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt27/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt3/Makefile b/regtest/rt3/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt3/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt3/Makefile b/regtest/rt3/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt3/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt30/Makefile b/regtest/rt30/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt30/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt30/Makefile b/regtest/rt30/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt30/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt31/Makefile b/regtest/rt31/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt31/Makefile
+++ b/regtest/rt31/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt32/Makefile b/regtest/rt32/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt32/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt32/Makefile b/regtest/rt32/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt32/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt33/Makefile b/regtest/rt33/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt33/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt33/Makefile b/regtest/rt33/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt33/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt34/Makefile b/regtest/rt34/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt34/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt34/Makefile b/regtest/rt34/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt34/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt35/Makefile b/regtest/rt35/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt35/Makefile
+++ b/regtest/rt35/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt36/Makefile b/regtest/rt36/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt36/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt36/Makefile b/regtest/rt36/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt36/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt37/Makefile b/regtest/rt37/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt37/Makefile
+++ b/regtest/rt37/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt38/Makefile b/regtest/rt38/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt38/Makefile
+++ b/regtest/rt38/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt39/Makefile b/regtest/rt39/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt39/Makefile
+++ b/regtest/rt39/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt4/Makefile b/regtest/rt4/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt4/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt4/Makefile b/regtest/rt4/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt4/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt40/Makefile b/regtest/rt40/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt40/Makefile
+++ b/regtest/rt40/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt41/Makefile b/regtest/rt41/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt41/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt41/Makefile b/regtest/rt41/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt41/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt42/Makefile b/regtest/rt42/Makefile
index e243f28ec1..275c4b5047 100644
--- a/regtest/rt42/Makefile
+++ b/regtest/rt42/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt5/Makefile b/regtest/rt5/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt5/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt5/Makefile b/regtest/rt5/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt5/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt6/Makefile b/regtest/rt6/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt6/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt6/Makefile b/regtest/rt6/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt6/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt7/Makefile b/regtest/rt7/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt7/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt7/Makefile b/regtest/rt7/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt7/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt8/Makefile b/regtest/rt8/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt8/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt8/Makefile b/regtest/rt8/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt8/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt9/Makefile b/regtest/rt9/Makefile
deleted file mode 120000
index a19fbb5e94..0000000000
--- a/regtest/rt9/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/test.make
\ No newline at end of file
diff --git a/regtest/rt9/Makefile b/regtest/rt9/Makefile
new file mode 100644
index 0000000000..275c4b5047
--- /dev/null
+++ b/regtest/rt9/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make