diff --git a/features/data/configs/tags.json b/features/data/configs/tags.json
new file mode 100644
index 00000000..dc69950c
--- /dev/null
+++ b/features/data/configs/tags.json
@@ -0,0 +1,14 @@
+{
+  "default_hour": 9,
+  "timeformat": "%Y-%m-%d %H:%M",
+  "linewrap": 80,
+  "encrypt": false,
+  "editor": "",
+  "default_minute": 0,
+  "highlight": true,
+  "password": "",
+  "journals": {
+    "default": "features/journals/tags.journal"
+  },
+  "tagsymbols": "@"
+}
diff --git a/features/data/journals/tags.journal b/features/data/journals/tags.journal
new file mode 100644
index 00000000..7b5cdf04
--- /dev/null
+++ b/features/data/journals/tags.journal
@@ -0,0 +1,7 @@
+2013-06-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.
+As alway's he shared his latest @idea on how to rule the world with me.
diff --git a/features/tagging.feature b/features/tagging.feature
new file mode 100644
index 00000000..a030d610
--- /dev/null
+++ b/features/tagging.feature
@@ -0,0 +1,12 @@
+Feature: Tagging
+
+    Scenario: Displaying tags
+        Given we use the config "tags.json"
+        When we run "jrnl --tags"
+        Then we should get no error
+        and the output should be
+            """
+            @idea                : 2
+            @journal             : 1
+            @dan                 : 1
+            """