1 files changed, 4 insertions, 5 deletions
diff --git a/test/orm/merge.py b/test/orm/merge.py
index cca01f2a5..3dd0a95a4 100644
--- a/test/orm/merge.py
+++ b/test/orm/merge.py
@@ -1,8 +1,9 @@
-from testbase import PersistTest, AssertMixin
 import testbase
 from sqlalchemy import *
-from tables import *
-import tables
+from sqlalchemy.orm import *
+from testlib import *
+from testlib.tables import *
+import testlib.tables as tables
 
 class MergeTest(AssertMixin):
     """tests session.merge() functionality"""
@@ -164,5 +165,3 @@ class MergeTest(AssertMixin):
         
 if __name__ == "__main__":    
     testbase.main()
-
-                
-\ No newline at end of file