diff --git a/Makefile.am b/Makefile.am
index 8ed9d7c4..c352e257 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,17 +174,19 @@ check-local:
 	$(TESTENV) ./snapraid$(EXEEXT) --test-skip-device -H
 	$(TESTENV) ./snapraid$(EXEEXT) --test-skip-device -V
 	$(TESTENV) ./mktest$(EXEEXT)
-	echo --- Run the self test only this time
-	$(TESTENV) ./snapraid$(EXEEXT) --test-skip-device -c $(CONF) status
-	echo --- Run the speed test
-	$(TESTENV) ./snapraid$(EXEEXT) --test-skip-device -T
 if HAVE_EMULATOR
-# Run speed test in different architectures
-	$(TESTENV_SSE2) ./snapraid$(EXEEXT) --test-skip-device -T
-	$(TESTENV_SSSE3) ./snapraid$(EXEEXT) --test-skip-device -T
-	$(TESTENV_AVX2) ./snapraid$(EXEEXT) --test-skip-device -T
 # Run the self test in AVX2
 	$(TESTENV_AVX2) ./snapraid$(EXEEXT) --test-skip-device -c $(CONF) status
+# Run the speed test in different architectures
+	$(TESTENV_SSE2) ./snapraid$(EXEEXT) --test-skip-device -T
+	$(TESTENV_SSSE3) ./snapraid$(EXEEXT) --test-skip-device -T
+	$(TESTENV_SSE42) ./snapraid$(EXEEXT) --test-skip-device -T
+	$(TESTENV_AVX2) ./snapraid$(EXEEXT) --test-skip-device -T
+else
+# Run the self test natively
+	$(TESTENV) ./snapraid$(EXEEXT) --test-skip-device -c $(CONF) status
+# Run the speed test natively
+	$(TESTENV) ./snapraid$(EXEEXT) --test-skip-device -T
 endif
 	echo --- Some commands with empty array
 	$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS_VERBOSE) -c $(CONF) diff
diff --git a/configure.ac b/configure.ac
index f2a783bd..ddd8df9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,10 +198,16 @@ AC_ARG_ENABLE([sgcheck],
 
 AC_ARG_ENABLE([sde],
 	[AS_HELP_STRING([--enable-sde],[enable the use of SDE emulator in testing])],
+dnl p4 -> Pentium4 with SSE2
+dnl mrm -> Merom with SSSE3
+dnl nhm -> Nehalem with SSE4.2
+dnl hsw -> Haswell with AVX2
+dnl knl -> Knights Landing with AVX512
 	[
 	TESTENV_SSE2="$SDE -p4 --"
-	TESTENV_SSE4="$SDE -msm --"
-	TESTENV_AVX2="$SDE --"
+	TESTENV_SSSE3="$SDE -mrm --"
+	TESTENV_SSE42="$SDE -nhm --"
+	TESTENV_AVX2="$SDE -hsw --"
 	EMULATOR=1
 	],
 	[])
@@ -231,6 +237,7 @@ AC_ARG_VAR([TESTENV], [Test environment])
 AC_ARG_VAR([FAILENV], [Test environment for failing tests])
 AC_ARG_VAR([TESTENV_SSE2], [Test environment for SSE2])
 AC_ARG_VAR([TESTENV_SSSE3], [Test environment for SSSE3])
+AC_ARG_VAR([TESTENV_SSE42], [Test environment for SSE42])
 AC_ARG_VAR([TESTENV_AVX2], [Test environment for AVX2])
 
 AC_CONFIG_FILES([Makefile])