diff --git a/glymur/__init__.py b/glymur/__init__.py
index fb37ef0..fb1c504 100644
--- a/glymur/__init__.py
+++ b/glymur/__init__.py
@@ -6,7 +6,6 @@ from .jp2k import Jp2k
 from .jp2dump import jp2dump
 
 from . import data
-#from . import test
 
 
 def runtests():
diff --git a/glymur/test/__init__.py b/glymur/test/__init__.py
index 89c7eea..e69de29 100644
--- a/glymur/test/__init__.py
+++ b/glymur/test/__init__.py
@@ -1,11 +0,0 @@
-from .test_callbacks import TestCallbacks as callbacks
-from .test_codestream import TestCodestream as codestream
-from .test_config import TestSuite as config
-from .test_jp2k import TestJp2k as jp2k
-from .test_icc import TestICC as icc
-from .test_printing import TestPrinting as printing
-from .test_opj_suite import TestSuite as suite
-from .test_opj_suite import TestSuiteDump as suitedump
-from .test_opj_suite_write import TestSuiteWrite as suitew
-from .test_opj_suite_neg import TestSuiteNegative as suiteneg
-from .test_jp2box import TestJp2Boxes as box
diff --git a/glymur/test/test_conformance.py b/glymur/test/test_conformance.py
index ec179c2..9f40b3e 100644
--- a/glymur/test/test_conformance.py
+++ b/glymur/test/test_conformance.py
@@ -20,15 +20,11 @@ try:
     format_corpus_data_root = os.environ['FORMAT_CORPUS_DATA_ROOT']
 except KeyError:
     format_corpus_data_root = None
-except:
-    raise
 
 try:
     opj_data_root = os.environ['OPJ_DATA_ROOT']
 except KeyError:
     opj_data_root = None
-except:
-    raise
 
 
 @unittest.skipIf(format_corpus_data_root is None,