diff --git a/windows/test/__init__.py b/windows/test/__init__.py
index 6e1b5fa..57d22ea 100644
--- a/windows/test/__init__.py
+++ b/windows/test/__init__.py
@@ -5,7 +5,9 @@ from mytest import WindowsTestCase, WindowsAPITestCase, NativeUtilsTestCase, Sys
 from test_hooks import HookTestCase
 from test_debugger import DebuggerTestCase
 from test_syswow import SyswowTestCase
+from test_crypto import CryptoTestCase
 
 
 __all__ = ["SystemTestCase", "WindowsTestCase", "WindowsAPITestCase",
-        "DebuggerTestCase", "NativeUtilsTestCase", "HookTestCase", "SyswowTestCase"]
+        "DebuggerTestCase", "NativeUtilsTestCase", "HookTestCase", "SyswowTestCase",
+        "CryptoTestCase"]
diff --git a/windows/test/test_crypto.py b/windows/test/test_crypto.py
new file mode 100644
index 0000000..59c8b4e
--- /dev/null
+++ b/windows/test/test_crypto.py
@@ -0,0 +1,95 @@
+import windows.crypto
+import time
+from test_utils import *
+from windows.generated_def.winstructs import *
+
+
+
+TEST_CERT = """
+MIIBwTCCASqgAwIBAgIQG46Uyws+67ZBOfPJCbFrRjANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQD
+ExRQeXRob25Gb3JXaW5kb3dzVGVzdDAeFw0xNzA0MTIxNDM5MjNaFw0xODA0MTIyMDM5MjNaMB8x
+HTAbBgNVBAMTFFB5dGhvbkZvcldpbmRvd3NUZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQCRHwC/sRfXh5pc4poc85aidrudbPdya+0OeonQlf1JQ1ekf7KSfADV5FLkSQu2BzgBK9DIWTGX
+XknBJIzZF03UZsVg5D67V2mnSClXucc0cGFcK4pDDt0tHeabA2GPinVe7Z6qDT4ZxPR8lKaXDdV2
+Pg2hTdcGSpqaltHxph7G/QIDAQABMA0GCSqGSIb3DQEBCwUAA4GBACcQFdOlVjYICOIyAXowQaEN
+qcLpN1iWoL9UijNhTY37+U5+ycFT8QksT3Xmh9lEIqXMh121uViy2P/3p+Ek31AN9bB+BhWIM6PQ
+gy+ApYDdSwTtWFARSrMqk7rRHUveYEfMw72yaOWDxCzcopEuADKrrYEute4CzZuXF9PbbgK6"""
+
+## Cert info:
+#  Name: PythonForWindowsTest
+#  Serial: '1b 8e 94 cb 0b 3e eb b6 41 39 f3 c9 09 b1 6b 46'
+
+TEST_PFX_PASSWORD = "TestPassword"
+
+TEST_PFX = """
+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
+"""
+
+
+class CryptoTestCase(unittest.TestCase):
+    def setUp(self):
+        self.raw_cert = TEST_CERT.decode("base64")
+        self.raw_pfx = TEST_PFX.decode("base64")
+
+    def test_certificate(self):
+        cert = windows.crypto.CertificateContext.from_buffer(self.raw_cert)
+        self.assertEqual(cert.serial, '1b 8e 94 cb 0b 3e eb b6 41 39 f3 c9 09 b1 6b 46')
+        self.assertEqual(cert.name, 'PythonForWindowsTest')
+
+    def test_pfx(self):
+        pfx = windows.crypto.import_pfx(self.raw_pfx, TEST_PFX_PASSWORD)
+        orig_cert = windows.crypto.CertificateContext.from_buffer(self.raw_cert)
+        certs = pfx.certs
+        self.assertEqual(len(certs), 1)
+        # Test cert comparaison
+        self.assertEqual(certs[0], orig_cert)
+
+    def test_open_pfx_bad_password(self):
+        with self.assertRaises(WindowsError) as ar:
+            pfx = windows.crypto.import_pfx(self.raw_pfx, "BadPassword")
+
+    def test_encrypt_decrypt(self):
+        message_to_encrypt = "Testing message \xff\x01"
+        cert = windows.crypto.CertificateContext.from_buffer(self.raw_cert)
+        # encrypt should accept a cert or iterable of cert
+        res = windows.crypto.encrypt(cert, message_to_encrypt)
+        res2 = windows.crypto.encrypt([cert], message_to_encrypt)
+        del cert
+        self.assertNotIn(message_to_encrypt, res)
+
+        # Open pfx and decrypt
+        pfx = windows.crypto.import_pfx(self.raw_pfx, TEST_PFX_PASSWORD)
+        decrypt = windows.crypto.decrypt(pfx, res)
+        decrypt2 = windows.crypto.decrypt(pfx, res2)
+
+        self.assertEqual(message_to_encrypt, decrypt)
+        self.assertEqual(decrypt, decrypt2)
+
+
diff --git a/windows/test/test_syswow.py b/windows/test/test_syswow.py
index 2ea47f3..fc19024 100644
--- a/windows/test/test_syswow.py
+++ b/windows/test/test_syswow.py
@@ -42,8 +42,7 @@ class SyswowTestCase(unittest.TestCase):
             import windows
             import windows.native_exec.simple_x64 as x64
             windows.utils.create_console()
-            windows.current_process.write_qword({0},  0x8877665544332211)
-            x64_code = x64.assemble("mov r11, 0x1122334455667788; label :loop; jmp :loop; nop; nop; ret")
+            x64_code = x64.assemble("mov r11, 0x1122334455667788; mov rax, 0x8877665544332211; mov [{0}], rax ;label :loop; jmp :loop; nop; nop; ret")
             res = windows.syswow64.execute_64bits_code_from_syswow(x64_code)
             print("res = {{0}}".format(hex(res)))
             windows.current_process.write_qword({0},  res)