diff --git a/tests/bdd/features/encrypt.feature b/tests/bdd/features/encrypt.feature
index a8b31c2e..02bff32f 100644
--- a/tests/bdd/features/encrypt.feature
+++ b/tests/bdd/features/encrypt.feature
@@ -28,18 +28,24 @@ Feature: Encrypting and decrypting journals
     # This should warn the user that the journal is already encrypted
 
 
-    Scenario: Encrypting a journal
+    Scenario Outline: Encrypting a journal
         Given we use the config "simple.yaml"
         When we run "jrnl --encrypt" and enter
             swordfish
             swordfish
             n
-        Then we should see the message "Journal encrypted"
+        Then we should get no error
+        And we should see the message "Journal encrypted"
         And the config for journal "default" should contain "encrypt: true"
         When we run "jrnl -n 1" and enter "swordfish"
         Then we should be prompted for a password
         And the output should contain "2013-06-10 15:40 Life is good"
 
+        Examples: configs
+        | config_file        |
+        | basic_onefile.yaml |
+
+
     Scenario Outline: Attempt to encrypt a folder or DayOne journal should result in an error
         Given we use the config "<config_file>"
         When we run "jrnl --encrypt"
@@ -47,14 +53,5 @@ Feature: Encrypting and decrypting journals
 
         Examples: configs
         | config_file       |
-        | empty_folder.yaml |
-        | dayone.yaml       |
-
-    Scenario Outline: Attempt to encrypt basic journal should not result in an error
-        Given we use the config "<config_file>"
-        When we run "jrnl --encrypt"
-        Then we should get no error
-
-        Examples: configs
-        | config_file       |
-        | simple.yaml       |
+        | basic_folder.yaml |
+        | basic_dayone.yaml |