diff --git a/tests/pico-hsm/test_004_key_domains.py b/tests/pico-hsm/test_004_key_domains.py
index 52243ca..c92421a 100644
--- a/tests/pico-hsm/test_004_key_domains.py
+++ b/tests/pico-hsm/test_004_key_domains.py
@@ -37,7 +37,22 @@ def test_key_domains(device):
     assert(kd['error'] == 0x6A86)
     assert(device.get_key_domains() == KEY_DOMAINS)
 
-def test_set_key_domain(device):
+def test_import_dkek_wrong_key_domain(device):
+    with pytest.raises(APDUResponse) as e:
+        device.import_dkek(DEFAULT_DKEK, key_domain=0)
+    assert(e.value.sw == SWCodes.SW_COMMAND_NOT_ALLOWED.value)
+
+def test_import_dkek_fail(device):
+    with pytest.raises(APDUResponse) as e:
+        device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN)
+    assert(e.value.sw == SWCodes.SW_COMMAND_NOT_ALLOWED.value)
+
+def test_set_key_domain_fail(device):
+    with pytest.raises(APDUResponse) as e:
+        device.set_key_domain(key_domain=10)
+    assert(e.value.sw == SWCodes.SW_INCORRECT_P1P2.value)
+
+def test_set_key_domain_ok(device):
     kd = device.get_key_domain(key_domain=TEST_KEY_DOMAIN)
     assert('error' in kd)
     assert(kd['error'] == 0x6A88)
@@ -51,12 +66,7 @@ def test_set_key_domain(device):
     assert('missing' in kd['dkek'])
     assert(kd['dkek']['missing'] == DEFAULT_DKEK_SHARES)
 
-def test_import_dkek_wrong_key_domain(device):
-    with pytest.raises(APDUResponse) as e:
-        device.import_dkek(DEFAULT_DKEK, key_domain=0)
-    assert(e.value.sw == SWCodes.SW_COMMAND_NOT_ALLOWED.value)
-
-def test_import_dkek(device):
+def test_import_dkek_ok(device):
     resp = device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN)
     assert(resp[0] == DEFAULT_DKEK_SHARES)
     assert(resp[1] == DEFAULT_DKEK_SHARES-1)