diff --git a/rostests/kmtests/kernel32/FindFile_user.c b/rostests/kmtests/kernel32/FindFile_user.c
index 08c412b4083..45a95a08a26 100644
--- a/rostests/kmtests/kernel32/FindFile_user.c
+++ b/rostests/kmtests/kernel32/FindFile_user.c
@@ -61,6 +61,30 @@ START_TEST(FindFile)
         { L"?a?",       L">a>" },
         { L"a?a?a",     L"a>a>a" },
 
+        { L"?.?",        L">\">" },
+        { L"a?.?",       L"a>\">" },
+        { L"?.?a",       L">\">a" },
+        { L"a?.?a",      L"a>\">a" },
+        { L"?.??.?",     L">\">>\">" },
+        { L"?.?a?.?",    L">\">a>\">" },
+        { L"a?.?a?.?a",  L"a>\">a>\">a" },
+
+        { L".?",         L"\">" },
+        { L"a.?",        L"a\">" },
+        { L".?a",        L"\">a" },
+        { L"a.?a",       L"a\">a" },
+        { L".?.?",       L"\">\">" },
+        { L".?a.?",      L"\">a\">" },
+        { L"a.?a.?a",    L"a\">a\">a" },
+
+        { L"?.",         L">" },
+        { L"a?.",        L"a>" },
+        { L"?.a",        L">.a" },
+        { L"a?.a",       L"a>.a" },
+        { L"?.?.",       L">\">" },
+        { L"?.a?.",      L">.a>" },
+        { L"a?.a?.a",    L"a>.a>.a" },
+
         { L"f*.",       L"f<" },
         { L"f.*",       L"f\"*" },
         { L"f*.*",      L"f<\"*" },
diff --git a/rostests/kmtests/kmtest_drv/kmtest_drv.c b/rostests/kmtests/kmtest_drv/kmtest_drv.c
index 0c27dc3b994..580eb0ff04c 100644
--- a/rostests/kmtests/kmtest_drv/kmtest_drv.c
+++ b/rostests/kmtests/kmtest_drv/kmtest_drv.c
@@ -12,7 +12,7 @@
 #include <limits.h>
 #include <pseh/pseh2.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 #include <kmt_public.h>
diff --git a/rostests/kmtests/kmtest_drv/kmtest_standalone.c b/rostests/kmtests/kmtest_drv/kmtest_standalone.c
index d59f46de2d1..cce8e0ddce3 100644
--- a/rostests/kmtests/kmtest_drv/kmtest_standalone.c
+++ b/rostests/kmtests/kmtest_drv/kmtest_standalone.c
@@ -12,7 +12,7 @@
 #define KMT_DEFINE_TEST_FUNCTIONS
 #include <kmt_test.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 #include <kmt_public.h>