diff --git a/features/data/configs/encrypted_with_pw.json b/features/data/configs/encrypted_with_pw.json
new file mode 100644
index 00000000..1a277240
--- /dev/null
+++ b/features/data/configs/encrypted_with_pw.json
@@ -0,0 +1,14 @@
+{
+  "default_hour": 9,
+  "timeformat": "%Y-%m-%d %H:%M",
+  "linewrap": 80,
+  "encrypt": true,
+  "editor": "",
+  "default_minute": 0,
+  "highlight": true,
+  "password": "bad doggie no biscuit",
+  "journals": {
+    "default": "features/journals/encrypted.journal"
+  },
+  "tagsymbols": "@"
+}
diff --git a/features/encryption.feature b/features/encryption.feature
index 72749f23..43d07c26 100644
--- a/features/encryption.feature
+++ b/features/encryption.feature
@@ -1,4 +1,4 @@
-    Feature: Multiple journals
+    Feature: Encrypted journals
 
         Scenario: Loading an encrypted journal
             Given we use the config "encrypted.json"
@@ -22,6 +22,11 @@
             Then we should see the message "Password"
             and the output should contain "2013-06-10 15:40 Life is good"
 
+        Scenario: Loading an encrypted journal with password in config
+            Given we use the config "encrypted_with_pw.json"
+            When we run "jrnl -n 1"
+            Then the output should contain "2013-06-10 15:40 Life is good"
+
         Scenario: Storing a password in Keychain
             Given we use the config "multiple.json"
             When we run "jrnl simple --encrypt" and enter "sabertooth"