diff --git a/tests/pytests/unit/crypt/test_crypt_cryptodome.py b/tests/pytests/unit/crypt/test_crypt_cryptodome.py
index 357b302e3c6..dd9f891aa49 100644
--- a/tests/pytests/unit/crypt/test_crypt_cryptodome.py
+++ b/tests/pytests/unit/crypt/test_crypt_cryptodome.py
@@ -35,8 +35,8 @@ pytestmark = [
 
 @pytest.mark.slow_test
 def test_gen_keys():
-    open_priv_wb = MockCall("/keydir{}keyname.pem".format(os.sep), "wb+")
-    open_pub_wb = MockCall("/keydir{}keyname.pub".format(os.sep), "wb+")
+    open_priv_wb = MockCall(f"/keydir{os.sep}keyname.pem", "wb+")
+    open_pub_wb = MockCall(f"/keydir{os.sep}keyname.pub", "wb+")
 
     with patch.multiple(
         os,
@@ -48,7 +48,7 @@ def test_gen_keys():
             "os.path.isfile", return_value=True
         ):
             result = salt.crypt.gen_keys("/keydir", "keyname", 2048)
-            assert result == "/keydir{}keyname.pem".format(os.sep), result
+            assert result == f"/keydir{os.sep}keyname.pem", result
             assert open_priv_wb not in m_open.calls
             assert open_pub_wb not in m_open.calls
 
diff --git a/tests/pytests/unit/crypt/test_crypt_m2crypto.py b/tests/pytests/unit/crypt/test_crypt_m2crypto.py
index f06bbdbc9cc..2be141e77fd 100644
--- a/tests/pytests/unit/crypt/test_crypt_m2crypto.py
+++ b/tests/pytests/unit/crypt/test_crypt_m2crypto.py
@@ -19,20 +19,22 @@ def test_gen_keys():
             "M2Crypto.RSA.RSA.save_pub_key", MagicMock()
         ) as save_pub:
             with patch("os.path.isfile", return_value=True):
-                assert salt.crypt.gen_keys(
-                    "/keydir", "keyname", 2048
-                ) == "/keydir{}keyname.pem".format(os.sep)
+                assert (
+                    salt.crypt.gen_keys("/keydir", "keyname", 2048)
+                    == f"/keydir{os.sep}keyname.pem"
+                )
                 save_pem.assert_not_called()
                 save_pub.assert_not_called()
 
             with patch("os.path.isfile", return_value=False):
-                assert salt.crypt.gen_keys(
-                    "/keydir", "keyname", 2048
-                ) == "/keydir{}keyname.pem".format(os.sep)
-                save_pem.assert_called_once_with(
-                    "/keydir{}keyname.pem".format(os.sep), cipher=None
+                assert (
+                    salt.crypt.gen_keys("/keydir", "keyname", 2048)
+                    == f"/keydir{os.sep}keyname.pem"
                 )
-                save_pub.assert_called_once_with("/keydir{}keyname.pub".format(os.sep))
+                save_pem.assert_called_once_with(
+                    f"/keydir{os.sep}keyname.pem", cipher=None
+                )
+                save_pub.assert_called_once_with(f"/keydir{os.sep}keyname.pub")
 
 
 @pytest.mark.slow_test
@@ -44,24 +46,30 @@ def test_gen_keys_with_passphrase():
             "M2Crypto.RSA.RSA.save_pub_key", MagicMock()
         ) as save_pub:
             with patch("os.path.isfile", return_value=True):
-                assert salt.crypt.gen_keys(
-                    "/keydir", "keyname", 2048, passphrase="password"
-                ) == "/keydir{}keyname.pem".format(os.sep)
+                assert (
+                    salt.crypt.gen_keys(
+                        "/keydir", "keyname", 2048, passphrase="password"
+                    )
+                    == f"/keydir{os.sep}keyname.pem"
+                )
                 save_pem.assert_not_called()
                 save_pub.assert_not_called()
 
             with patch("os.path.isfile", return_value=False):
-                assert salt.crypt.gen_keys(
-                    "/keydir", "keyname", 2048, passphrase="password"
-                ) == "/keydir{}keyname.pem".format(os.sep)
+                assert (
+                    salt.crypt.gen_keys(
+                        "/keydir", "keyname", 2048, passphrase="password"
+                    )
+                    == f"/keydir{os.sep}keyname.pem"
+                )
                 callback = save_pem.call_args[1]["callback"]
                 save_pem.assert_called_once_with(
-                    "/keydir{}keyname.pem".format(os.sep),
+                    f"/keydir{os.sep}keyname.pem",
                     cipher="des_ede3_cbc",
                     callback=callback,
                 )
                 assert callback(None) == b"password"
-                save_pub.assert_called_once_with("/keydir{}keyname.pub".format(os.sep))
+                save_pub.assert_called_once_with(f"/keydir{os.sep}keyname.pub")
 
 
 def test_sign_message():