diff --git a/fail_db.txt b/fail_db.txt
index ecbb2dbc..000853f1 100644
--- a/fail_db.txt
+++ b/fail_db.txt
@@ -166,3 +166,26 @@
 ./tests/ptr-19.ispc runfail  x86-64     generic-16   Linux LLVM 3.7 clang++3.4 -O0 *
 ./tests/ptr-22.ispc runfail  x86-64     generic-16   Linux LLVM 3.7 clang++3.4 -O0 *
 ./tests/test-143.ispc runfail  x86-64     generic-16   Linux LLVM 3.7 clang++3.4 -O0 *
+./tests/acos.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/asin.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/load-int16-1.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/load-int8-1.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/operators2.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/packed-store-1.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/packed-store2-1.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/short-circuit-14.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/short-circuit-15.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/short-vec-5.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/short-vec-6.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/transcendentals-2-1.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/transcendentals-2-2.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/transcendentals-2-3.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O2 *
+./tests/acos.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/asin.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/short-circuit-14.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/short-circuit-15.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/short-circuit-5.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/short-circuit-6.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/short-circuit-7.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/short-circuit-8.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
+./tests/short-circuit-9.ispc runfail  x86-64 avx512knl-i32x16   Linux LLVM 3.7 clang++3.7 -O0 *
diff --git a/ispc.cpp b/ispc.cpp
index 648cbd27..24266f15 100644
--- a/ispc.cpp
+++ b/ispc.cpp
@@ -1132,13 +1132,13 @@ Target::SupportedTargets() {
         "sse4-i32x4, sse4-i32x8, sse4-i16x8, sse4-i8x16, "
         "avx1-i32x4, "
         "avx1-i32x8, avx1-i32x16, avx1-i64x4, "
-        "avx1.1-i32x8, avx1.1-i32x16, avx1.1-i64x4 "
+        "avx1.1-i32x8, avx1.1-i32x16, avx1.1-i64x4, "
         "avx2-i32x8, avx2-i32x16, avx2-i64x4, "
-        "generic-x1, generic-x4, generic-x8, generic-x16, "
-        "generic-x32, generic-x64, *-generic-x16, "
 #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) && !defined(LLVM_3_6)// LLVM 3.7+
-        "avx512knl-i32x16"
+        "avx512knl-i32x16, "
 #endif
+        "generic-x1, generic-x4, generic-x8, generic-x16, "
+        "generic-x32, generic-x64, *-generic-x16"
 #ifdef ISPC_ARM_ENABLED
         ", neon-i8x16, neon-i16x8, neon-i32x4"
 #endif
diff --git a/run_tests.py b/run_tests.py
index ced34cd7..3ee16027 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -922,7 +922,7 @@ if __name__ == "__main__":
     parser.add_option('-v', '--verbose', dest='verbose', help='Enable verbose output',
                   default=False, action="store_true")
     parser.add_option('--wrap-exe', dest='wrapexe',
-                  help='Executable to wrap test runs with (e.g. "valgrind" or "sde --knl -- ")',
+                  help='Executable to wrap test runs with (e.g. "valgrind" or "sde -knl -- ")',
                   default="")
     parser.add_option('--time', dest='time', help='Enable time output',
                   default=False, action="store_true")
@@ -937,12 +937,5 @@ if __name__ == "__main__":
                   default=False, action="store_true")
     (options, args) = parser.parse_args()
 
-    # Untill we have the hardware to run testing on:
-    if ((options.target == "knl-generic") and (options.wrapexe == "")):
-        options.wrapexe = "sde -knl -- "        
-
-    if ((options.target == "avx512knl-i32x16") and (options.wrapexe == "")):
-        options.wrapexe = "sde -knl -- "        
-
     L = run_tests(options, args, 1)
     exit(0)