diff --git a/tests/test_mardownwriter_python3.py b/tests/test_mardownwriter_python3.py
new file mode 100644
index 0000000..1a93573
--- /dev/null
+++ b/tests/test_mardownwriter_python3.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+
+from markdownwriter import MarkdownWriter, MarkdownTable
+
+import unittest
+
+style = 'bold'
+
+
+class TestMarkdownWriter(unittest.TestCase):
+
+    def setUp(self):
+        self.md = MarkdownWriter.MarkdownWriter()
+
+    def test_addSpace(self):
+        self.md.addSpace()
+        self.assertEqual(self.md.stream, ' ')
+
+    def test_addSimpleLineBreak(self):
+        self.md.addSimpleLineBreak()
+        self.assertEqual(self.md.stream, '  \n')
+
+    def test_addDoubleLineBreak(self):
+        self.md.addDoubleLineBreak()
+        self.assertEqual(self.md.stream, '\n \n')
+
+    def test_addTabulation(self):
+        self.md.addTabulation(9)
+        self.assertEqual(self.md.stream, '>>>>>>>>>')
+
+    def test_addHorizontalRule(self):
+        self.md.addHorizontalRule()
+        self.assertEqual(self.md.stream, '\n \n-----\n \n')
+
+    def test_addHeader(self):
+        self.md.addHeader('text', 6)
+        self.assertEqual(self.md.stream, '###### text\n')
+
+    def test_addHeader0(self):
+        self.assertRaises(ValueError, self.md.addHeader, 'text', 0)
+
+    def test_addHeader7(self):
+        self.assertRaises(ValueError, self.md.addHeader, 'text', 7)
+
+    def test_addParagraph(self):
+        self.md.addParagraph('text', 6, style)
+        self.assertEqual(self.md.stream, '>>>>>>__text__\n \n')
+
+    def test_addParagraphNegTab(self):
+        self.assertRaises(ValueError, self.md.addParagraph, 'text', -3, style)
+
+    def test_addText(self):
+        self.md.addText('text', style)
+        self.assertEqual(self.md.stream, '__text__')
+
+    def test_addList(self):
+        self.md.addList(['text1', 'text2'], True, 1, style)
+        self.assertEqual(self.md.stream, '>1. __text1__  \n>2. __text2__  \n')
+
+    def test_addStringToList(self):
+        self.assertRaises(ValueError, self.md.addList, 'text1', True, 1, style)
+
+    def test_addListNegTab(self):
+        self.assertRaises(
+            ValueError, self.md.addList, 'text1', True, -4, style
+        )
+
+    def test_addCodeBlock1(self):
+        self.md.addCodeBlock("string = \"Hello World\"")
+        self.assertEqual(self.md.stream, '  \n\tstring = \"Hello World\"  \n')
+
+    def test_addCodeBlock2(self):
+        self.md.addCodeBlock(
+            "string = \"Hello World\"\nprint string\nfile.open()"
+        )
+        self.assertEqual(
+            self.md.stream,
+            '  \n'
+            '\tstring = \"Hello World\"  \n'
+            '\tprint string  \n'
+            '\tfile.open()  \n'
+        )
+
+    def test_addCodeWord(self):
+        self.md.addCodeWord("string = \"Hello World\"")
+        self.assertEqual(self.md.stream, '`string = \"Hello World\"`')
+
+    def test_addLink1(self):
+        self.md.addLink("URL", "TEXT")
+        self.assertEqual(self.md.stream, '[TEXT](URL)')
+
+    def test_addLink2(self):
+        self.md.addLink("URL", "TEXT", "TITLE")
+        self.assertEqual(self.md.stream, '[TEXT](URL \"TITLE\")')
+
+    def test_addImage(self):
+        self.md.addImage("URL", "TITLE", "TEXT")
+        self.assertEqual(self.md.stream, '![TEXT](URL \"TITLE\")')
+
+    def test_addImageWithLink(self):
+        self.md.addImageWithLink("IMAGE_URL", "LINK_URL", "TITLE", "TEXT")
+        self.assertEqual(self.md.stream, '[![TEXT](IMAGE_URL \"TITLE\")](LINK_URL)')
+
+    def test_getStream(self):
+        self.md.addText('text', style)
+        self.assertEqual(self.md.getStream(), '__text__')
+
+    def test_getStylizedText(self):
+        self.assertEqual(self.md.getStylizedText('text', style), '__text__')
+
+    def test_transformSpecialCharacters(self):
+        self.assertEqual(
+            self.md.transformSpecialCharacters("* ` _ {} ! & <"),
+            '\* \` \_ \{\} \! &amp; &lt;'
+        )
+
+    def test_tableHeadersOnly(self):
+        table = MarkdownTable.MarkdownTable(["First Header", "Second", "3rd", "Last"])
+        self.md.addTable(table)
+        self.assertEqual(self.md.getStream(), """\
+First Header | Second | 3rd | Last
+-------------|--------|-----|-----
+""")
+
+    def test_tableHeadersAndRows(self):
+        table = MarkdownTable.MarkdownTable([u"First Header", u"Second", u"3rd", u"Fourth"])
+        table.addRow(["some data", "Longer column", "3", "Fourth"])
+        table.addRow(["some longer data", "small", "3", "Fourth"])
+        self.md.addTable(table)
+        self.assertEqual(self.md.getStream(), """\
+First Header     | Second        | 3rd | Fourth
+-----------------|---------------|-----|-------
+some data        | Longer column | 3   | Fourth
+some longer data | small         | 3   | Fourth
+""")
+
+    def test_tableRaises(self):
+        self.assertRaises(ValueError, MarkdownTable.MarkdownTable, None)
+        self.assertRaises(ValueError, MarkdownTable.MarkdownTable, "")
+        self.assertRaises(ValueError, MarkdownTable.MarkdownTable, [])
+        table = MarkdownTable.MarkdownTable([u"First Header", u"Second", u"3rd", u"Fourth"])
+        table.addRow(["some longer data", "small", "3"])
+        self.assertRaises(
+            ValueError, table.addRow,
+            ["some longer data", "small", "3", "Fourth", "Error maker"]
+        )