4 files changed, 12 insertions, 10 deletions
diff --git a/tests/options/html4.html b/tests/options/html4.html
deleted file mode 100644
index 7c88ad7..0000000
--- a/tests/options/html4.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>A test of the most<br>
-basic of html/xhtml differences.</p>
-\ No newline at end of file
diff --git a/tests/options/html4.txt b/tests/options/html4.txt
deleted file mode 100644
index fddaf8e..0000000
--- a/tests/options/html4.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-A test of the most  
-basic of html/xhtml differences.
-\ No newline at end of file
diff --git a/tests/test_apis.py b/tests/test_apis.py
index c813e56..b5c7733 100644
--- a/tests/test_apis.py
+++ b/tests/test_apis.py
@@ -695,6 +695,18 @@ class testSerializers(unittest.TestCase):
             '<p>foo</p>'
         )
 
+    def testXHTMLOutput(self):
+        self.assertEqual(
+            markdown.markdown('foo  \nbar', output_format='xhtml'),
+            '<p>foo<br />\nbar</p>'
+        )
+
+    def testHTMLOutput(self):
+        self.assertEqual(
+            markdown.markdown('foo  \nbar', output_format='html'),
+            '<p>foo<br>\nbar</p>'
+        )
+
 
 class testAtomicString(unittest.TestCase):
     """ Test that AtomicStrings are honored (not parsed). """
diff --git a/tests/test_legacy.py b/tests/test_legacy.py
index 0d0dd09..f4e807e 100644
--- a/tests/test_legacy.py
+++ b/tests/test_legacy.py
@@ -41,12 +41,6 @@ class TestMisc(LegacyTestCase):
     location = os.path.join(parent_test_dir, 'misc')
 
 
-class TestOptions(LegacyTestCase):
-    location = os.path.join(parent_test_dir, 'options')
-
-    html4 = Kwargs(output_format='html4')
-
-
 class TestPhp(LegacyTestCase):
     """
     Notes on "excluded" tests: