diff --git a/src/rougail/__init__.py b/src/rougail/__init__.py
index 8ba6a53bb..5e35d2a2e 100644
--- a/src/rougail/__init__.py
+++ b/src/rougail/__init__.py
@@ -1,4 +1,5 @@
 from .loader import load
+from .objspace import CreoleObjSpace
 from .annotator import modes
 
-__ALL__ = ('load', 'modes')
+__ALL__ = ('load', 'CreoleObjSpace', 'modes')
diff --git a/tests/test_flattener.py b/tests/test_flattener.py
index 27bd188e7..6031de0b5 100644
--- a/tests/test_flattener.py
+++ b/tests/test_flattener.py
@@ -6,10 +6,10 @@ from json import load
 
 #from creole.xmlreflector import CreoleObjSpace, CreoleDictConsistencyError
 #from creole import xmlreflector
-from creole import objspace, annotator
+from rougail import objspace, annotator
 from creole.xml_compare import xml_compare
 from creole.error import CreoleDictConsistencyError
-from creole.config import dtdfilename
+from rougail.config import dtdfilename