diff --git a/tests/bdd/features/template.feature b/tests/bdd/features/template.feature
new file mode 100644
index 00000000..02e2a3bc
--- /dev/null
+++ b/tests/bdd/features/template.feature
@@ -0,0 +1,19 @@
+# Copyright © 2012-2023 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
+Feature: Using templates
+
+    Scenario Outline: Template contents should be used in new entry
+        Given we use the config "<config_file>"
+        And we use the password "test" if prompted
+        When we run "jrnl --config-override template features/templates/basic.template"
+        And we run "jrnl -1"
+        Then the output should contain "This text is in the basic template"
+
+        Examples: configs
+        | config_file          |
+        | basic_onefile.yaml   |
+        | basic_encrypted.yaml |
+        | basic_folder.yaml    |
+        | basic_dayone.yaml    |
+
diff --git a/tests/bdd/test_features.py b/tests/bdd/test_features.py
index 387bd6cc..196f1cd9 100644
--- a/tests/bdd/test_features.py
+++ b/tests/bdd/test_features.py
@@ -20,5 +20,6 @@ scenarios("features/password.feature")
 scenarios("features/search.feature")
 scenarios("features/star.feature")
 scenarios("features/tag.feature")
+scenarios("features/template.feature")
 scenarios("features/upgrade.feature")
 scenarios("features/write.feature")
diff --git a/tests/data/templates/basic.template b/tests/data/templates/basic.template
new file mode 100644
index 00000000..9834eb39
--- /dev/null
+++ b/tests/data/templates/basic.template
@@ -0,0 +1 @@
+This text is in the basic template
diff --git a/tests/lib/given_steps.py b/tests/lib/given_steps.py
index f0c691d1..8e930a31 100644
--- a/tests/lib/given_steps.py
+++ b/tests/lib/given_steps.py
@@ -106,6 +106,12 @@ def we_use_the_config(request, temp_dir, working_dir):
     journal_dest = os.path.join(temp_dir.name, "features", "journals")
     shutil.copytree(journal_source, journal_dest)
 
+    # @todo maybe only copy needed templates over?
+    # Copy all of the templates over
+    template_source = os.path.join(working_dir, "data", "templates")
+    template_dest = os.path.join(temp_dir.name, "features", "templates")
+    shutil.copytree(template_source, template_dest)
+
     # @todo get rid of this by using default config values
     # merge in version number
     if (