diff --git a/features/core.feature b/features/core.feature
index 85b13d90..08f7aea8 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -39,7 +39,7 @@ Feature: Basic reading and writing to a journal
         Given we use the config "basic.yaml"
         When we run "jrnl" and enter "25 jul 2013: I saw Elvis. He's alive."
         Then we should get no error
-        and the journal should contain "2013-07-25 09:00 I saw Elvis."
+        and the journal should contain "[2013-07-25 09:00] I saw Elvis."
         and the journal should contain "He's alive."
 
     Scenario: Displaying the version number
diff --git a/features/data/journals/encrypted.journal b/features/data/journals/encrypted.journal
index f628c25c..d2a5fcbe 100644
--- a/features/data/journals/encrypted.journal
+++ b/features/data/journals/encrypted.journal
@@ -1 +1 @@
-gAAAAABVH4F009PRK-vz0bGa2elPRuNWvQOFjDt_TQtTbgHDBCiWgEzsTF7c4Vy-iqm-MYOh2UUrh_kUX7vTzsj3R-OJsKEYRy060yUaOH3cfBB1QHmMBhefV2XSJ-A5u_PryN137rf7kbV5Xk0jSDi2GbRuIRT6yRER1y-MAn4RDs0jfpxfeskZ65ykaB9-5Rm-lA_1ygHM9Uwrcu3HyrMJei1C6kl23w==
+gAAAAABVIHB7tnwKExG7aC5ZbAbBL9SG2oY2GENeoOJ22i1PZigOvCYvrQN3kpsu0KGr7ay5K-_46R5YFlqJvtQ8anPH2FSITsaZy-l5Lz_5quw3rmzhLwAR1tc0icgtR4MEpXEdsuQ7cyb12Xq-JLDrnATs0id5Vow9Ri_tE7Xe4BXgXaySn3aRPwWKoninVxVPVvETY3MXHSUEXV9OZ-pH5kYBLGYbLA==
diff --git a/features/data/journals/simple.journal b/features/data/journals/simple_jrnl-1-9-5.journal
similarity index 100%
rename from features/data/journals/simple.journal
rename to features/data/journals/simple_jrnl-1-9-5.journal
diff --git a/features/data/journals/tags-216.journal b/features/data/journals/tags-216.journal
index 4bd942b9..08b6d630 100644
--- a/features/data/journals/tags-216.journal
+++ b/features/data/journals/tags-216.journal
@@ -1,2 +1,2 @@
-2013-06-10 15:40 I programmed for @OS/2.
+[2013-06-10 15:40] I programmed for @OS/2.
 Almost makes me want to go back to @C++, though. (Still better than @C#).
diff --git a/features/data/journals/tags-237.journal b/features/data/journals/tags-237.journal
index a1b5f5d4..be050652 100644
--- a/features/data/journals/tags-237.journal
+++ b/features/data/journals/tags-237.journal
@@ -1,3 +1,3 @@
-2014-07-22 11:11 This entry has an email.
+[2014-07-22 11:11] This entry has an email.
 @Newline tag should show as a tag.
 Kyla's @email is kyla@clevelandunderdog.org and Guinness's is guinness@fortheloveofpits.org.
diff --git a/features/data/journals/tags.journal b/features/data/journals/tags.journal
index b4186a53..a28f3159 100644
--- a/features/data/journals/tags.journal
+++ b/features/data/journals/tags.journal
@@ -1,8 +1,8 @@
-2013-04-09 15:39 I have an @idea:
+[2013-04-09 15:39] I have an @idea:
 (1) write a command line @journal software
 (2) ???
 (3) PROFIT!
 
-2013-06-10 15:40 I met with @dan.
+[2013-06-10 15:40] I met with @dan.
 As alway's he shared his latest @idea on how to rule the world with me.
 inst
diff --git a/features/regression.feature b/features/regression.feature
index 9ae04713..3018ea10 100644
--- a/features/regression.feature
+++ b/features/regression.feature
@@ -19,14 +19,14 @@ Feature: Zapped bugs should stay dead.
         Given we use the config "basic.yaml"
         When we run "jrnl 2013-11-30 15:42: Project Started."
         Then we should see the message "Entry added"
-        and the journal should contain "2013-11-30 15:42 Project Started."
+        and the journal should contain "[2013-11-30 15:42] Project Started."
 
     Scenario: Date in the future should be parsed correctly
         # https://github.com/maebert/jrnl/issues/185
         Given we use the config "basic.yaml"
         When we run "jrnl 26/06/2019: Planet? Earth. Year? 2019."
         Then we should see the message "Entry added"
-        and the journal should contain "2019-06-26 09:00 Planet?"
+        and the journal should contain "[2019-06-26 09:00] Planet?"
 
     Scenario: Loading entry with ambiguous time stamp
         #https://github.com/maebert/jrnl/issues/153
diff --git a/features/starring.feature b/features/starring.feature
index 35154045..18113dc3 100644
--- a/features/starring.feature
+++ b/features/starring.feature
@@ -4,7 +4,7 @@ Feature: Starring entries
         Given we use the config "basic.yaml"
         When we run "jrnl 20 july 2013 *: Best day of my life!"
         Then we should see the message "Entry added"
-        and the journal should contain "2013-07-20 09:00 Best day of my life! *"
+        and the journal should contain "[2013-07-20 09:00] Best day of my life! *"
 
     Scenario: Filtering by starred entries
         Given we use the config "basic.yaml"