diff --git a/autoconf_share/assay b/autoconf_share/assay
index 206514770dd4c31f57c097c57f3a4bf420c66e99..54e4942b9e916bced3bb846301d71a87b012a0ba 100755
--- a/autoconf_share/assay
+++ b/autoconf_share/assay
@@ -196,7 +196,7 @@
 
 
 # Define exit and interrupt handler.
-  trap '#rm -rf core ${PROG}_tmp*; \
+  trap 'rm -rf core ${PROG}_tmp*; \
         trap - 0 ; \
         exit $STATUS' 0 1 2 3 15
 
diff --git a/autoconf_share/runtest.sh b/autoconf_share/runtest.sh
index 6941829c31d923c296d08215dd0bccb2b8439f98..ec090031ff5636f1402035fae3e5bf7e5ba7208d 100755
--- a/autoconf_share/runtest.sh
+++ b/autoconf_share/runtest.sh
@@ -198,6 +198,6 @@ $lfr_share_dir/assay $1 $MAXTIME $PREC $NEEDOUTFIL
 STS=$?
 
 # Cleanup (mainly for make distcheck).
-#\rm -f $1.stdout $1.run $1.py $1.in $1.parset $1.log_prop
-#\rm -rf $1.in_*
+\rm -f $1.stdout $1.run $1.py $1.in $1.parset $1.log_prop
+\rm -rf $1.in_*
 exit $STS