diff --git a/test/scripts/localstest.py b/test/scripts/localstest.py
index e71b78d..bf3adab 100644
--- a/test/scripts/localstest.py
+++ b/test/scripts/localstest.py
@@ -29,4 +29,4 @@ class LocalVarsTest(unittest.TestCase):
         self.assertNotEqual( 0, locals["staticVar"] )
         self.assertEqual( pykd.DataIsStaticLocal, locals["staticVar"].dataKind() )
 
-        self.assertEqual( locals["dwProccessId"], locals["staticVar"] )
+        self.assertEqual( locals["dwProccessId"] + 1, locals["staticVar"] )
diff --git a/test/targetapp/targetapp.cpp b/test/targetapp/targetapp.cpp
index 80fd968..e98afe4 100644
--- a/test/targetapp/targetapp.cpp
+++ b/test/targetapp/targetapp.cpp
@@ -258,7 +258,7 @@ void FuncWithName1(int a)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-
+#pragma optimize("g", off)
 BOOL CALLBACK EnumWindowsProc(
     HWND hWindow,
     const LPARAM lParam
@@ -272,13 +272,13 @@ BOOL CALLBACK EnumWindowsProc(
     {
         static ULONGLONG staticVar = 0;
         DWORD dwThreadId = ::GetWindowThreadProcessId(hWindow, &dwProccessId);
-        staticVar = dwProccessId;
+        staticVar = dwProccessId + 1;
         __debugbreak();
         std::cout << dwProccessId << dwThreadId << staticVar;
     }
     return hWindow ? FALSE : TRUE;
 }
-
+#pragma optimize("g", on)
 ////////////////////////////////////////////////////////////////////////////////
 
 int doLoadUnload()
@@ -316,7 +316,10 @@ int _tmain(int argc, _TCHAR* argv[])
                 return doLoadUnload();
 
             if ( !_tcsicmp(argv[1], _T("-testEnumWindows")) )
-                return ::EnumWindows(&EnumWindowsProc, 6);
+            {
+                ::EnumWindows(&EnumWindowsProc, 6);
+                return ERROR_SUCCESS;
+            }
         }
 
         __debugbreak();