diff --git a/tests/test_org.py b/tests/test_org.py
index 0a4acc7..9d2b735 100644
--- a/tests/test_org.py
+++ b/tests/test_org.py
@@ -797,6 +797,23 @@ class TestSerde(unittest.TestCase):
     def test_add_todo_keywords_programatically(self):
         orig = '''* NEW_TODO_STATE First entry
 
+* NEW_DONE_STATE Second entry'''
+        doc = loads(orig, environment={
+            'org-todo-keywords': "NEW_TODO_STATE | NEW_DONE_STATE"
+        })
+        self.assertEqual(doc.headlines[0].is_todo, True)
+        self.assertEqual(doc.headlines[0].is_done, False)
+
+        self.assertEqual(doc.headlines[1].is_todo, False)
+        self.assertEqual(doc.headlines[1].is_done, True)
+
+        self.assertEqual(dumps(doc), orig)
+
+    def test_add_todo_keywords_in_file(self):
+        orig = '''#+TODO: NEW_TODO_STATE | NEW_DONE_STATE
+
+* NEW_TODO_STATE First entry
+
 * NEW_DONE_STATE Second entry'''
         doc = loads(orig, environment={
             'org-todo-keywords': "NEW_TODO_STATE | NEW_DONE_STATE"