test: Unmerged fixes
diff --git a/tests/keyctl/dh_compute/bad-args/runtest.sh b/tests/keyctl/dh_compute/bad-args/runtest.sh
index da07c6a..08c7433 100644
--- a/tests/keyctl/dh_compute/bad-args/runtest.sh
+++ b/tests/keyctl/dh_compute/bad-args/runtest.sh
@@ -76,7 +76,7 @@
marker "CHECK MISSING KEY"
dh_compute --fail $privateid $primeid 0
-expect_error ENOKEY
+expect_error EINVAL
unlink_key --wait $generatorid @s
dh_compute --fail $privateid $primeid $generatorid
expect_error ENOKEY
diff --git a/tests/keyctl/listing/bad-args/runtest.sh b/tests/keyctl/listing/bad-args/runtest.sh
index 84e3f07..fcc36d8 100644
--- a/tests/keyctl/listing/bad-args/runtest.sh
+++ b/tests/keyctl/listing/bad-args/runtest.sh
@@ -12,9 +12,9 @@
# check that a bad key ID fails correctly
marker "CHECK BAD KEY ID"
list_keyring --fail 0
-expect_error ENOKEY
+expect_error EINVAL
pretty_list_keyring --fail 0
-expect_error ENOKEY
+expect_error EINVAL
# create a non-keyring
marker "CREATE KEY"
diff --git a/tests/keyctl/reading/bad-args/runtest.sh b/tests/keyctl/reading/bad-args/runtest.sh
index 357d4d5..ebec77e 100644
--- a/tests/keyctl/reading/bad-args/runtest.sh
+++ b/tests/keyctl/reading/bad-args/runtest.sh
@@ -12,11 +12,11 @@
# check that a bad key ID fails correctly
marker "CHECK BAD KEY ID"
read_key --fail 0
-expect_error ENOKEY
+expect_error EINVAL
print_key --fail 0
-expect_error ENOKEY
+expect_error EINVAL
pipe_key --fail 0
-expect_error ENOKEY
+expect_error EINVAL
# create a non-keyring
marker "CREATE KEY"
