diff --git a/tests/pfwtest.py b/tests/pfwtest.py
index e0fad45..8357c6a 100644
--- a/tests/pfwtest.py
+++ b/tests/pfwtest.py
@@ -28,6 +28,9 @@ def process_architecture_only(target_archi):
     return pytest.mark.skipif(windows.current_process.architecture != target_archi,
                                 reason="Test for {0} architecture process only".format(target_archi))
 
+def system_architecture_only(target_archi):
+        return pytest.mark.skipif(windows.system.architecture != target_archi,
+                                reason="Test for {0} architecture system only".format(target_archi))
 
 check_for_gc_garbage = pytest.mark.usefixtures("check_for_gc_garbage")
 check_for_handle_leak = pytest.mark.usefixtures("check_for_handle_leak")
diff --git a/tests/test_syswow.py b/tests/test_syswow.py
index c857d7e..56c7014 100644
--- a/tests/test_syswow.py
+++ b/tests/test_syswow.py
@@ -61,7 +61,7 @@ class TestSyswowRemoteProcess(object):
         assert "Wow64LdrpInitialize" in wow64.pe.exports
 
 
-    @process_architecture_only(gdef.IMAGE_FILE_MACHINE_AMD64)
+    @system_architecture_only(gdef.PROCESSOR_ARCHITECTURE_AMD64)
     def test_getset_syswow_context(self, proc32):
         addr = proc32.virtual_alloc(0x1000)
         remote_python_code = """