diff --git a/split_cl.py b/split_cl.py
index 9c0bc77ced..f742360b3f 100644
--- a/split_cl.py
+++ b/split_cl.py
@@ -60,7 +60,7 @@ def AddUploadedByGitClSplitToDescription(description):
   """
   split_footers = git_footers.split_footers(description)
   lines = split_footers[0]
-  if not lines[-1] or lines[-1].isspace():
+  if lines[-1] and not lines[-1].isspace():
     lines = lines + ['']
   lines = lines + ['This CL was uploaded by git cl split.']
   if split_footers[1]:
diff --git a/tests/split_cl_test.py b/tests/split_cl_test.py
new file mode 100755
index 0000000000..083ba60834
--- /dev/null
+++ b/tests/split_cl_test.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env vpython3
+"""Tests for split_cl."""
+
+import os
+import sys
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import split_cl
+
+
+class SplitClTest(unittest.TestCase):
+  _description = """Convert use of X to Y in $directory
+
+<add some background about this conversion for the reviewers>
+
+"""
+
+  _footers = 'Bug: 12345'
+
+  def testAddUploadedByGitClSplitToDescription(self):
+    added_line = 'This CL was uploaded by git cl split.'
+
+    # Description without footers
+    self.assertEqual(
+        split_cl.AddUploadedByGitClSplitToDescription(self._description),
+        self._description + added_line)
+    # Description with footers
+    self.assertEqual(
+        split_cl.AddUploadedByGitClSplitToDescription(self._description +
+                                                      self._footers),
+        self._description + added_line + '\n\n' + self._footers)
+
+
+if __name__ == '__main__':
+  unittest.main()