diff --git a/glymur/test/test_jp2box.py b/glymur/test/test_jp2box.py
index 8fdd3c3..a2aa9d6 100644
--- a/glymur/test/test_jp2box.py
+++ b/glymur/test/test_jp2box.py
@@ -472,7 +472,7 @@ class TestColourSpecificationBox(unittest.TestCase):
 
 @unittest.skipIf(glymur.lib.openjp2.OPENJP2 is None,
                  "Missing openjp2 library.")
-class TestJp2Boxes(unittest.TestCase):
+class TestWrap(unittest.TestCase):
 
     def setUp(self):
         self.j2kfile = glymur.data.goodstuff()
@@ -481,39 +481,6 @@ class TestJp2Boxes(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def test_default_JPEG2000SignatureBox(self):
-        # Should be able to instantiate a JPEG2000SignatureBox
-        b = glymur.jp2box.JPEG2000SignatureBox()
-        self.assertEqual(b.signature, (13, 10, 135, 10))
-
-    def test_default_FileTypeBox(self):
-        # Should be able to instantiate a FileTypeBox
-        b = glymur.jp2box.FileTypeBox()
-        self.assertEqual(b.brand, 'jp2 ')
-        self.assertEqual(b.minor_version, 0)
-        self.assertEqual(b.compatibility_list, ['jp2 '])
-
-    def test_default_ImageHeaderBox(self):
-        # Should be able to instantiate an image header box.
-        b = glymur.jp2box.ImageHeaderBox(height=512, width=256,
-                                         num_components=3)
-        self.assertEqual(b.height,  512)
-        self.assertEqual(b.width,  256)
-        self.assertEqual(b.num_components,  3)
-        self.assertEqual(b.bits_per_component, 8)
-        self.assertFalse(b.signed)
-        self.assertFalse(b.colorspace_unknown)
-
-    def test_default_JP2HeaderBox(self):
-        b1 = JP2HeaderBox()
-        b1.box = [ImageHeaderBox(height=512, width=256),
-                  ColourSpecificationBox(colorspace=glymur.core.GREYSCALE)]
-
-    def test_default_ContiguousCodestreamBox(self):
-        b = ContiguousCodestreamBox()
-        self.assertEqual(b.box_id, 'jp2c')
-        self.assertIsNone(b.main_header)
-
     def verify_wrapped_raw(self, jp2file):
         # Shared method by at least two tests.
         jp2 = Jp2k(jp2file)
@@ -679,6 +646,42 @@ class TestJp2Boxes(unittest.TestCase):
                 j2k.wrap(tfile.name, boxes=boxes)
 
 
+class TestJp2Boxes(unittest.TestCase):
+
+    def test_default_JPEG2000SignatureBox(self):
+        # Should be able to instantiate a JPEG2000SignatureBox
+        b = glymur.jp2box.JPEG2000SignatureBox()
+        self.assertEqual(b.signature, (13, 10, 135, 10))
+
+    def test_default_FileTypeBox(self):
+        # Should be able to instantiate a FileTypeBox
+        b = glymur.jp2box.FileTypeBox()
+        self.assertEqual(b.brand, 'jp2 ')
+        self.assertEqual(b.minor_version, 0)
+        self.assertEqual(b.compatibility_list, ['jp2 '])
+
+    def test_default_ImageHeaderBox(self):
+        # Should be able to instantiate an image header box.
+        b = glymur.jp2box.ImageHeaderBox(height=512, width=256,
+                                         num_components=3)
+        self.assertEqual(b.height,  512)
+        self.assertEqual(b.width,  256)
+        self.assertEqual(b.num_components,  3)
+        self.assertEqual(b.bits_per_component, 8)
+        self.assertFalse(b.signed)
+        self.assertFalse(b.colorspace_unknown)
+
+    def test_default_JP2HeaderBox(self):
+        b1 = JP2HeaderBox()
+        b1.box = [ImageHeaderBox(height=512, width=256),
+                  ColourSpecificationBox(colorspace=glymur.core.GREYSCALE)]
+
+    def test_default_ContiguousCodestreamBox(self):
+        b = ContiguousCodestreamBox()
+        self.assertEqual(b.box_id, 'jp2c')
+        self.assertIsNone(b.main_header)
+
+
 class TestJpxBoxes(unittest.TestCase):
 
     def setUp(self):