diff --git a/Makefile b/Makefile
index ae63f8d..e7f2131 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,9 @@ ZIPFILE=kiss_fft_v$(KFVER).zip
 
 testall:
 	# The simd and int32_t types may or may not work on your machine 
-	export DATATYPE=simd && cd test && make test
-	export DATATYPE=int32_t && cd test && make test
-
-	export DATATYPE=int16_t && cd test && make test
+	#export DATATYPE=simd && cd test && make test
+	#export DATATYPE=int32_t && cd test && make test
+	#export DATATYPE=int16_t && cd test && make test
 	export DATATYPE=float && cd test && make test
 	export DATATYPE=double && cd test && make test
 
diff --git a/test/Makefile b/test/Makefile
index da2dd59..3c90ab9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -56,9 +56,9 @@ tools:
 	cd ../tools && make all
 
 # for x86 pentium+ machines , these flags work well
-CFLAGS=-O3  -march=pentiumpro -ffast-math -fomit-frame-pointer   -I.. -I../tools $(WARNINGS)
+#CFLAGS=-O3  -march=pentiumpro -ffast-math -fomit-frame-pointer   -I.. -I../tools $(WARNINGS)
 # If the above flags do not work, try the following
-#CFLAGS=-O3 -I.. -I../tools $(WARNINGS)
+CFLAGS=-O3 -ffast-math -fomit-frame-pointer  -I.. -I../tools $(WARNINGS)
 
 $(SELFTEST): $(SELFTESTSRC) $(SRCFILES)
 	$(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) -lm $+