diff --git a/Makefile b/Makefile
index b20a743..fc0cd5f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ZIPFILE=kiss_fft_v$(KFVER).zip
 testall:
 	# The simd and long types may or may not work on your machine 
 	#export DATATYPE=simd && cd test && make test
-	export DATATYPE=long && cd test && make test
+	#export DATATYPE=long && cd test && make test
 	
 	export DATATYPE=short && cd test && make test
 	export DATATYPE=float && cd test && make test
diff --git a/test/benchkiss.c b/test/benchkiss.c
index 84e01bd..d379480 100644
--- a/test/benchkiss.c
+++ b/test/benchkiss.c
@@ -67,6 +67,8 @@ int main(int argc,char ** argv)
     fprintf(stderr,"KISS\tnfft=%d\tnumffts=%d\n" ,nfft,numffts);
     pstats_report();
 
+    kiss_fft_cleanup();
+
     return 0;
 }
 
diff --git a/test/twotonetest.c b/test/twotonetest.c
index 0407177..56c76a3 100644
--- a/test/twotonetest.c
+++ b/test/twotonetest.c
@@ -59,6 +59,7 @@ double two_tone_test( int nfft, int bin1,int bin2)
         else
             sigpow += mag2;
     }
+    kiss_fft_cleanup();
     /*printf("TEST %d,%d,%d noise @ %fdB\n",nfft,bin1,bin2,10*log10(noisepow/sigpow +1e-30) );*/
     return 10*log10(sigpow/(noisepow+1e-50) );
 }