diff --git a/source/m3_exec.h b/source/m3_exec.h
index 84e20f0..34c04fa 100644
--- a/source/m3_exec.h
+++ b/source/m3_exec.h
@@ -692,7 +692,7 @@ d_m3SetRegisterSetSlot (f64, _fp0)
 #if defined(d_m3SkipMemoryBoundsCheck)
 #  define m3MemCheck(x) true
 #else
-#  define m3MemCheck(x) (x)
+#  define m3MemCheck(x) LIKELY(x)
 #endif
 
 #ifdef DEBUG
diff --git a/test/run-spec-test.py b/test/run-spec-test.py
index cca5b12..f70c35c 100755
--- a/test/run-spec-test.py
+++ b/test/run-spec-test.py
@@ -449,8 +449,8 @@ if args.file:
     jsonFiles = args.file
 else:
     jsonFiles = glob.glob(os.path.join(".", "core", "*.json"))
-    #jsonFiles = list(map(lambda x: os.path.relpath(x, curDir), jsonFiles))
 
+jsonFiles = list(map(lambda x: os.path.relpath(x, scriptDir), jsonFiles))
 jsonFiles.sort()
 
 for fn in jsonFiles: