diff --git a/features/data/configs/dayone_empty.yaml b/features/data/configs/dayone_empty.yaml
new file mode 100644
index 00000000..7750d389
--- /dev/null
+++ b/features/data/configs/dayone_empty.yaml
@@ -0,0 +1,17 @@
+default_hour: 9
+default_minute: 0
+editor: noop
+template: false
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/dayone_empty.dayone
+linewrap: 80
+tagsymbols: '@'
+timeformat: '%Y-%m-%d %H:%M'
+indent_character: "|"
+colors:
+  date: none
+  title: none
+  body: none
+  tags: none
diff --git a/features/data/journals/dayone_empty.dayone/entries/empty.txt b/features/data/journals/dayone_empty.dayone/entries/empty.txt
new file mode 100644
index 00000000..c86b8f66
--- /dev/null
+++ b/features/data/journals/dayone_empty.dayone/entries/empty.txt
@@ -0,0 +1 @@
+This file exists to preserve the directory structure, but should be ignored by jrnl.
diff --git a/features/star.feature b/features/star.feature
index e98976a4..62d1007d 100644
--- a/features/star.feature
+++ b/features/star.feature
@@ -1,15 +1,35 @@
 Feature: Starring entries
 
-    Scenario: Starring an entry will mark it in the journal file
-        Given we use the config "basic.yaml"
+    Scenario Outline: Starring an entry will mark it in the journal file
+        Given we use the config <config_file>
         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! *"
+        When we run "jrnl -on 2013-07-20 -starred"
+        Then the output should contain "2013-07-20 09:00 Best day of my life!"
 
-    Scenario: Filtering by starred entries
-        Given we use the config "basic.yaml"
+        Examples: configs
+        | config_file         |
+        | "basic.yaml"        |
+        | "empty_folder.yaml" |
+        | "dayone.yaml"       |
+
+    Scenario Outline: Filtering by starred entries
+        Given we use the config <config_file>
         When we run "jrnl -starred"
         Then the output should be empty
         When we run "jrnl 20 july 2013 *: Best day of my life!"
         When we run "jrnl -starred"
         Then the output should be "2013-07-20 09:00 Best day of my life!"
+
+        Examples: configs
+        | config_file         |
+        | "basic.yaml"        |
+        | "empty_folder.yaml" |
+        | "dayone_empty.yaml" |
+
+    Scenario: Starring an entry will mark it in an encrypted journal
+        Given we use the config "encrypted.yaml"
+        When we run "jrnl 20 july 2013 *: Best day of my life!" and enter "bad doggie no biscuit"
+        Then we should see the message "Entry added"
+        When we run "jrnl -on 2013-07-20 -starred" and enter "bad doggie no biscuit"
+        Then the output should contain "2013-07-20 09:00 Best day of my life!"