diff --git a/tests/features/encrypt.feature b/tests/features/encrypt.feature
index f2d0a62f..b9b9ff5a 100644
--- a/tests/features/encrypt.feature
+++ b/tests/features/encrypt.feature
@@ -5,7 +5,11 @@ Feature: Encrypting and decrypting journals
         When we run "jrnl --decrypt" and enter "bad doggie no biscuit"
         Then the config for journal "default" should have "encrypt" set to "bool:False"
         And we should see the message "Journal decrypted"
-        And the journal should have 2 entries
+        When we run "jrnl -99 --short"
+        Then the output should be
+            2013-06-09 15:39 My first entry.
+            2013-06-10 15:40 Life is good.
+
 
     @todo
     Scenario: Trying to decrypt an already unencrypted journal
@@ -13,20 +17,23 @@ Feature: Encrypting and decrypting journals
         Given we use the config "simple.yaml"
         When we run "jrnl --decrypt"
         Then the config for journal "default" should have "encrypt" set to "bool:False"
-        And the journal should have 2 entries
+        When we run "jrnl -99 --short"
+        Then the output should be
+            2013-06-09 15:39 My first entry.
+            2013-06-10 15:40 Life is good.
+
 
     @todo
     Scenario: Trying to encrypt an already encrypted journal
     # This should warn the user that the journal is already encrypted
 
+
     Scenario: Encrypting a journal
         Given we use the config "simple.yaml"
         When we run "jrnl --encrypt" and enter
-        """
-        swordfish
-        swordfish
-        n
-        """
+            swordfish
+            swordfish
+            n
         Then we should see the message "Journal encrypted"
         And the config for journal "default" should have "encrypt" set to "bool:True"
         When we run "jrnl -n 1" and enter "swordfish"
diff --git a/tests/step_defs/test_features.py b/tests/step_defs/test_features.py
index 0860059b..d04928be 100644
--- a/tests/step_defs/test_features.py
+++ b/tests/step_defs/test_features.py
@@ -4,7 +4,7 @@ scenarios("../features/build.feature")
 scenarios("../features/core.feature")
 scenarios("../features/datetime.feature")
 scenarios("../features/delete.feature")
-# scenarios("../features/encrypt.feature")
+scenarios("../features/encrypt.feature")
 # scenarios("../features/file_storage.feature")
 # scenarios("../features/format.feature")
 # scenarios("../features/import.feature")