diff --git a/tests/bdd/features/format.feature b/tests/bdd/features/format.feature
index 36a89747..9918755e 100644
--- a/tests/bdd/features/format.feature
+++ b/tests/bdd/features/format.feature
@@ -144,12 +144,11 @@ Feature: Custom formats
         | basic_folder.yaml    |
         | basic_dayone.yaml    |
 
-    @skip_editor # .TODO return after editor steps implemented
     Scenario Outline: Increasing Headings on Markdown export
         Given we use the config "<config_file>"
         And we use the password "test" if prompted
-        When we open the editor and append
-            [2020-10-14 13:23] Heading Test
+        Given we append to the editor if opened
+            [2021-10-14 13:23] Heading Test
 
             H1-1
             =
@@ -191,13 +190,15 @@ Feature: Custom formats
 
             More stuff
             more stuff again
+        When we run "jrnl --edit -1"
+        Then the editor should have been called
         When we run "jrnl -1 --export markdown"
         Then the output should be
-            # 2020
+            # 2021
 
             ## October
 
-            ### 2020-10-14 13:23 Heading Test
+            ### 2021-10-14 13:23 Heading Test
 
             #### H1-1
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 277e2602..fbbc3068 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -17,10 +17,6 @@ pytest_plugins = [
 def pytest_bdd_apply_tag(tag, function):
     if tag == "skip_win":
         marker = mark.skipif(on_windows(), reason="Skip test on Windows")
-    elif tag == "skip_editor":
-        marker = mark.skip(
-            reason="Skipping editor-related test. We should come back to this!"
-        )
     else:
         # Fall back to pytest-bdd's default behavior
         return None