diff --git a/tools/generate_and_run_more_tests.sh b/tools/generate_and_run_more_tests.sh
index 21b97e29b..5abb7c3f6 100755
--- a/tools/generate_and_run_more_tests.sh
+++ b/tools/generate_and_run_more_tests.sh
@@ -6,16 +6,8 @@
 set -e
 
 echo testmemleak
-rm -rf test1
-python tools/extracttests.py --code=test1 test/testmemleak.cpp
-cd test1
-../tools/run_more_tests.sh
-cd ..
+tools/run_more_tests.sh test/testmemleak.cpp
 
 echo testleakautovar
-rm -rf test1
-python tools/extracttests.py --code=test1 test/testleakautovar.cpp
-cd test1
-../tools/run_more_tests.sh
-cd ..
+tools/run_more_tests.sh test/testleakautovar.cpp
 
diff --git a/tools/run_more_tests.sh b/tools/run_more_tests.sh
index 49e74019e..27cd989a8 100755
--- a/tools/run_more_tests.sh
+++ b/tools/run_more_tests.sh
@@ -3,6 +3,10 @@
 
 set -e
 
+python tools/extracttests.py --code=test1 $1
+
+cd test1
+
 ../cppcheck -q . 2> 1.txt
 
 
@@ -89,4 +93,6 @@ sed  -ri 's/([(&][ ]*)(\-?[0-9]+)[ ]*\!=[ ]*([a-z]+)([ ]*[&)])/\1\3!=\2\4/' *.cp
 ../cppcheck -q . 2> 2.txt && diff 1.txt 2.txt
 
 
+cd ..
 
+rm -rf test1