diff --git a/testscour.py b/testscour.py
index 43eeb03..6daec27 100755
--- a/testscour.py
+++ b/testscour.py
@@ -2505,7 +2505,21 @@ class EmbedRasters(unittest.TestCase):
                             "Raster image from remote path '" + href + "' not embedded.")
 
 
-# TODO: write tests for --enable-viewboxing
+class ViewBox(unittest.TestCase):
+
+    def test_viewbox_create(self):
+        doc = scourXmlFile('unittests/viewbox-create.svg', parse_args(['--enable-viewboxing']))
+        viewBox = doc.documentElement.getAttribute('viewBox')
+        self.assertEqual(viewBox, '0 0 123.46 654.32', "viewBox not properly created with '--enable-viewboxing'.")
+
+    def test_viewbox_remove_width_and_height(self):
+        doc = scourXmlFile('unittests/viewbox-remove.svg', parse_args(['--enable-viewboxing']))
+        width = doc.documentElement.getAttribute('width')
+        height = doc.documentElement.getAttribute('height')
+        self.assertEqual(width, '', "width not removed with '--enable-viewboxing'.")
+        self.assertEqual(height, '', "height not removed with '--enable-viewboxing'.")
+
+
 # TODO: write tests for --keep-editor-data
 
 if __name__ == '__main__':
diff --git a/unittests/viewbox-create.svg b/unittests/viewbox-create.svg
new file mode 100644
index 0000000..0d250db
--- /dev/null
+++ b/unittests/viewbox-create.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="123.456" height="654.321">
+</svg>
diff --git a/unittests/viewbox-remove.svg b/unittests/viewbox-remove.svg
new file mode 100644
index 0000000..8fa8307
--- /dev/null
+++ b/unittests/viewbox-remove.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="123.456" height="654.321" viewBox="0 0 123.456 654.321">
+</svg>