diff --git a/castellan/tests/functional/config.py b/castellan/tests/functional/config.py
index 5bd0ede6..8345ef47 100644
--- a/castellan/tests/functional/config.py
+++ b/castellan/tests/functional/config.py
@@ -59,7 +59,7 @@ def setup_config(config_file=''):
         config_to_load.append(main_config)
 
     TEST_CONF(
-        (),  # Required to load an anonymous config
+        (),  # Required to load an anonymous configuration
         default_config_files=config_to_load
     )
 
diff --git a/castellan/tests/unit/key_manager/mock_key_manager.py b/castellan/tests/unit/key_manager/mock_key_manager.py
index 0297b2c3..f7e1bf75 100644
--- a/castellan/tests/unit/key_manager/mock_key_manager.py
+++ b/castellan/tests/unit/key_manager/mock_key_manager.py
@@ -212,7 +212,7 @@ class MockKeyManager(key_manager.KeyManager):
         symbols = ''.join(symbolgroups)
         password.extend([random.choice(symbols) for _i in range(length)])
 
-        # finally shuffle to ensure first x characters aren't from a
+        # Finally, shuffle to ensure first x characters aren't from a
         # predictable group
         random.shuffle(password)