Index: branches/pyyaml3000/tests/test_structure.py
===================================================================
--- branches/pyyaml3000/tests/test_structure.py	(revision 55)
+++ branches/pyyaml3000/tests/test_structure.py	(revision 57)
@@ -2,11 +2,5 @@
 import test_appliance
 
-from yaml.reader import Reader
-from yaml.scanner import Scanner
-from yaml.parser import *
-from yaml.composer import *
-from yaml.resolver import *
-from yaml.constructor import *
-from yaml.nodes import *
+from yaml import *
 
 class TestStructure(test_appliance.TestAppliance):
@@ -161,4 +155,6 @@
         return pairs
 
+MyConstructor.add_constructor(None, MyConstructor.construct_scalar)
+
 class TestConstructor(test_appliance.TestAppliance):