From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 16 Nov 2010 00:37:50 +0000 (-0500)
Subject: - move sqlalchemy.test to test.lib
X-Git-Tag: rel_0_7b1~226^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1402efb198f96090833a9b561cdba8dee937f70;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- move sqlalchemy.test to test.lib
---

diff --git a/sqla_nose.py b/sqla_nose.py
index 6482958cba..e6f60e4767 100755
--- a/sqla_nose.py
+++ b/sqla_nose.py
@@ -2,8 +2,8 @@
 """
 nose runner script.
 
-This script is a front-end to "nosetests" which doesn't
-require that SQLA's testing plugin be installed via setuptools.
+This script is a front-end to "nosetests" which
+installs SQLAlchemy's testing plugin into the local environment.
 
 """
 import sys
diff --git a/test/aaa_profiling/test_compiler.py b/test/aaa_profiling/test_compiler.py
index bc589c0b2f..a7422b49e7 100644
--- a/test/aaa_profiling/test_compiler.py
+++ b/test/aaa_profiling/test_compiler.py
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsExecutionResults):
diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py
index 5fa40a9978..4b443780a7 100644
--- a/test/aaa_profiling/test_memusage.py
+++ b/test/aaa_profiling/test_memusage.py
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy.orm import mapper, relationship, create_session, \
     clear_mappers, sessionmaker, class_mapper
 from sqlalchemy.orm.mapper import _mapper_registry
 from sqlalchemy.orm.session import _sessions
 from sqlalchemy.util import jython
 import operator
-from sqlalchemy.test import testing, engines
+from test.lib import testing, engines
 from sqlalchemy import MetaData, Integer, String, ForeignKey, \
     PickleType, create_engine, Unicode
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as sa
 from sqlalchemy.sql import column
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 import gc
 import weakref
 from test.orm import _base
diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index f2b876837c..1b39f6edb1 100644
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy import exc as sa_exc, util, Integer, String, ForeignKey
 from sqlalchemy.orm import exc as orm_exc, mapper, relationship, \
     sessionmaker
-from sqlalchemy.test import testing, profiling
+from test.lib import testing, profiling
 from test.orm import _base
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 
 class MergeTest(_base.MappedTest):
diff --git a/test/aaa_profiling/test_pool.py b/test/aaa_profiling/test_pool.py
index bc3c12d57f..a63a643cee 100644
--- a/test/aaa_profiling/test_pool.py
+++ b/test/aaa_profiling/test_pool.py
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.pool import QueuePool
 
 
diff --git a/test/aaa_profiling/test_resultset.py b/test/aaa_profiling/test_resultset.py
index bd9d3ae50f..9904267dc6 100644
--- a/test/aaa_profiling/test_resultset.py
+++ b/test/aaa_profiling/test_resultset.py
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 NUM_FIELDS = 10
 NUM_RECORDS = 1000
 
diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py
index dc990e9839..ec489beb15 100644
--- a/test/aaa_profiling/test_zoomark.py
+++ b/test/aaa_profiling/test_zoomark.py
@@ -7,7 +7,7 @@ import datetime
 import sys
 import time
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 ITERATIONS = 1
 dbapi_session = engines.ReplayableSession()
 metadata = None
diff --git a/test/aaa_profiling/test_zoomark_orm.py b/test/aaa_profiling/test_zoomark_orm.py
index 623ec67ba1..11285f9725 100644
--- a/test/aaa_profiling/test_zoomark_orm.py
+++ b/test/aaa_profiling/test_zoomark_orm.py
@@ -8,7 +8,7 @@ import sys
 import time
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 ITERATIONS = 1
 dbapi_session = engines.ReplayableSession()
 metadata = None
diff --git a/test/base/test_dependency.py b/test/base/test_dependency.py
index 9fddfc47ff..9f6344de71 100644
--- a/test/base/test_dependency.py
+++ b/test/base/test_dependency.py
@@ -1,6 +1,6 @@
 import sqlalchemy.topological as topological
-from sqlalchemy.test import TestBase
-from sqlalchemy.test.testing import assert_raises, eq_
+from test.lib import TestBase
+from test.lib.testing import assert_raises, eq_
 from sqlalchemy import exc, util
 
 
diff --git a/test/base/test_except.py b/test/base/test_except.py
index 78a534e671..f02ca988bc 100644
--- a/test/base/test_except.py
+++ b/test/base/test_except.py
@@ -2,7 +2,7 @@
 
 
 from sqlalchemy import exc as sa_exceptions
-from sqlalchemy.test import TestBase
+from test.lib import TestBase
 
 # Py3K 
 #StandardError = BaseException 
diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index d083a8458e..4f02d38110 100644
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -1,9 +1,9 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import copy, threading
 from sqlalchemy import util, sql, exc
-from sqlalchemy.test import TestBase
-from sqlalchemy.test.testing import eq_, is_, ne_
-from sqlalchemy.test.util import gc_collect, picklers
+from test.lib import TestBase
+from test.lib.testing import eq_, is_, ne_
+from test.lib.util import gc_collect, picklers
 from sqlalchemy.util import classproperty
 
 
diff --git a/test/bootstrap/config.py b/test/bootstrap/config.py
index 7d528a04b0..ef37e4f200 100644
--- a/test/bootstrap/config.py
+++ b/test/bootstrap/config.py
@@ -123,14 +123,14 @@ def _engine_pool(options, file_config):
 post_configure['engine_pool'] = _engine_pool
 
 def _create_testing_engine(options, file_config):
-    from sqlalchemy.test import engines, testing
+    from test.lib import engines, testing
     global db
     db = engines.testing_engine(db_url, db_opts)
     testing.db = db
 post_configure['create_engine'] = _create_testing_engine
 
 def _prep_testing_database(options, file_config):
-    from sqlalchemy.test import engines
+    from test.lib import engines
     from sqlalchemy import schema
 
     # also create alt schemas etc. here?
@@ -152,7 +152,7 @@ def _prep_testing_database(options, file_config):
 post_configure['prep_db'] = _prep_testing_database
 
 def _set_table_options(options, file_config):
-    from sqlalchemy.test import schema
+    from test.lib import schema
 
     table_options = schema.table_options
     for spec in options.tableopts:
@@ -167,7 +167,7 @@ def _reverse_topological(options, file_config):
     if options.reversetop:
         from sqlalchemy.orm import unitofwork, session, mapper, dependency
         from sqlalchemy import topological
-        from sqlalchemy.test.util import RandomSet
+        from test.lib.util import RandomSet
         topological.set = unitofwork.set = session.set = mapper.set = dependency.set = RandomSet
 post_configure['topological'] = _reverse_topological
 
diff --git a/test/bootstrap/noseplugin.py b/test/bootstrap/noseplugin.py
index f010641f68..1be8be5220 100644
--- a/test/bootstrap/noseplugin.py
+++ b/test/bootstrap/noseplugin.py
@@ -79,7 +79,7 @@ class NoseSQLAlchemy(Plugin):
         
     def begin(self):
         global testing, requires, util
-        from sqlalchemy.test import testing, requires
+        from test.lib import testing, requires
         from sqlalchemy import util
         
         testing.db = db
diff --git a/test/dialect/test_access.py b/test/dialect/test_access.py
index 0ea8d9a61a..bd0d7c22ac 100644
--- a/test/dialect/test_access.py
+++ b/test/dialect/test_access.py
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import sql
 from sqlalchemy.databases import access
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsCompiledSQL):
diff --git a/test/dialect/test_firebird.py b/test/dialect/test_firebird.py
index 41a50e6a3b..814c267b5c 100644
--- a/test/dialect/test_firebird.py
+++ b/test/dialect/test_firebird.py
@@ -1,9 +1,9 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 from sqlalchemy import *
 from sqlalchemy.databases import firebird
 from sqlalchemy.exc import ProgrammingError
 from sqlalchemy.sql import table, column
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class DomainReflectionTest(TestBase, AssertsExecutionResults):
diff --git a/test/dialect/test_informix.py b/test/dialect/test_informix.py
index ceec587d93..ea74dcbe4e 100644
--- a/test/dialect/test_informix.py
+++ b/test/dialect/test_informix.py
@@ -1,6 +1,6 @@
 from sqlalchemy import *
 from sqlalchemy.databases import informix
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsCompiledSQL):
diff --git a/test/dialect/test_maxdb.py b/test/dialect/test_maxdb.py
index 4df0490301..7d43d594bc 100644
--- a/test/dialect/test_maxdb.py
+++ b/test/dialect/test_maxdb.py
@@ -1,12 +1,12 @@
 """MaxDB-specific tests."""
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import StringIO, sys
 from sqlalchemy import *
 from sqlalchemy import exc, sql
 from decimal import Decimal
 from sqlalchemy.databases import maxdb
-from sqlalchemy.test import *
+from test.lib import *
 
 
 # TODO
diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py
index e766a8301a..26c53298c6 100644
--- a/test/dialect/test_mssql.py
+++ b/test/dialect/test_mssql.py
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import datetime
 import os
 import re
@@ -11,8 +11,8 @@ from sqlalchemy.sql import table, column
 from sqlalchemy.databases import mssql
 from sqlalchemy.dialects.mssql import pyodbc, mxodbc, pymssql
 from sqlalchemy.engine import url
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, emits_warning_on, \
+from test.lib import *
+from test.lib.testing import eq_, emits_warning_on, \
     assert_raises_message
 
 class CompileTest(TestBase, AssertsCompiledSQL):
diff --git a/test/dialect/test_mxodbc.py b/test/dialect/test_mxodbc.py
index f574177dd0..36cfc9b082 100644
--- a/test/dialect/test_mxodbc.py
+++ b/test/dialect/test_mxodbc.py
@@ -1,6 +1,6 @@
 from sqlalchemy import *
-from sqlalchemy.test.testing import eq_, TestBase
-from sqlalchemy.test import engines
+from test.lib.testing import eq_, TestBase
+from test.lib import engines
 
 # TODO: we should probably build mock bases for
 # these to share with test_reconnect, test_parseconnect
diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index 78e1b9ab0c..02e317b024 100644
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 
 # Py2K
 import sets
@@ -9,9 +9,9 @@ import sets
 from sqlalchemy import *
 from sqlalchemy import sql, exc, schema, types as sqltypes
 from sqlalchemy.dialects.mysql import base as mysql
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test import *
-from sqlalchemy.test.engines import utf8_engine
+from test.lib.testing import eq_
+from test.lib import *
+from test.lib.engines import utf8_engine
 import datetime
 
 class TypesTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index 04b9d32749..e1275dbfcf 100644
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy import types as sqltypes, exc
 from sqlalchemy.sql import table, column
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test.engines import testing_engine
+from test.lib import *
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib.engines import testing_engine
 from sqlalchemy.dialects.oracle import cx_oracle, base as oracle
 from sqlalchemy.engine import default
 from sqlalchemy.util import jython
diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py
index e20274aefa..3bc22f2a33 100644
--- a/test/dialect/test_postgresql.py
+++ b/test/dialect/test_postgresql.py
@@ -1,6 +1,6 @@
 # coding: utf-8
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test import  engines
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib import  engines
 import datetime
 import decimal
 from sqlalchemy import *
@@ -8,10 +8,10 @@ from sqlalchemy.orm import *
 from sqlalchemy import exc, schema, types
 from sqlalchemy.dialects.postgresql import base as postgresql
 from sqlalchemy.engine.strategies import MockEngineStrategy
-from sqlalchemy.test import *
-from sqlalchemy.test.util import round_decimal
+from test.lib import *
+from test.lib.util import round_decimal
 from sqlalchemy.sql import table, column
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.engine._base import TablesTest
 import logging
 
diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py
index 19ec260d37..90036147b9 100644
--- a/test/dialect/test_sqlite.py
+++ b/test/dialect/test_sqlite.py
@@ -1,13 +1,13 @@
 """SQLite-specific tests."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 import datetime
 from sqlalchemy import *
 from sqlalchemy import exc, sql, schema
 from sqlalchemy.dialects.sqlite import base as sqlite, \
     pysqlite as pysqlite_dialect
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class TestTypes(TestBase, AssertsExecutionResults):
diff --git a/test/dialect/test_sybase.py b/test/dialect/test_sybase.py
index 37de91d1c4..54e4f32e1e 100644
--- a/test/dialect/test_sybase.py
+++ b/test/dialect/test_sybase.py
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import sql
 from sqlalchemy.databases import sybase
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsCompiledSQL):
diff --git a/test/engine/_base.py b/test/engine/_base.py
index ec91243d24..773fa2fea5 100644
--- a/test/engine/_base.py
+++ b/test/engine/_base.py
@@ -1,6 +1,6 @@
 import sqlalchemy as sa
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import adict
+from test.lib import testing
+from test.lib.testing import adict
 
 
 class TablesTest(testing.TestBase):
diff --git a/test/engine/test_bind.py b/test/engine/test_bind.py
index dfcc5e172a..855c3611e9 100644
--- a/test/engine/test_bind.py
+++ b/test/engine/test_bind.py
@@ -1,14 +1,14 @@
 """tests the "bind" attribute/argument across schema and SQL,
 including the deprecated versions of these arguments"""
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import engine, exc
 from sqlalchemy import MetaData, ThreadLocalMetaData
 from sqlalchemy import Integer, text
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 
 
 class BindTest(testing.TestBase):
diff --git a/test/engine/test_ddlevents.py b/test/engine/test_ddlevents.py
index ccbbfd82d0..cc4f8b0e4d 100644
--- a/test/engine/test_ddlevents.py
+++ b/test/engine/test_ddlevents.py
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy.schema import DDL, CheckConstraint, AddConstraint, \
     DropConstraint
 from sqlalchemy import create_engine
 from sqlalchemy import MetaData, Integer, String
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
-from sqlalchemy.test.testing import AssertsCompiledSQL
+from test.lib import TestBase, testing, engines
+from test.lib.testing import AssertsCompiledSQL
 from nose import SkipTest
 
 class DDLEventTest(TestBase):
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 116b8fc223..9b63945fb8 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 import re
 from sqlalchemy.interfaces import ConnectionProxy
 from sqlalchemy import MetaData, Integer, String, INT, VARCHAR, func, \
     bindparam, select
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
+from test.lib import TestBase, testing, engines
 import logging
 from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
 
diff --git a/test/engine/test_metadata.py b/test/engine/test_metadata.py
index b2250c808f..daead42ded 100644
--- a/test/engine/test_metadata.py
+++ b/test/engine/test_metadata.py
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import assert_raises
-from sqlalchemy.test.testing import assert_raises_message
-from sqlalchemy.test.testing import emits_warning
+from test.lib.testing import assert_raises
+from test.lib.testing import assert_raises_message
+from test.lib.testing import emits_warning
 
 import pickle
 from sqlalchemy import Integer, String, UniqueConstraint, \
     CheckConstraint, ForeignKey, MetaData, Sequence, \
     ForeignKeyConstraint, ColumnDefault, Index
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy import schema, exc
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, ComparesTables, \
+from test.lib import TestBase, ComparesTables, \
     AssertsCompiledSQL, testing, engines
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 class MetaDataTest(TestBase, ComparesTables):
     def test_metadata_connect(self):
diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py
index 78b75ad2f4..7000549e76 100644
--- a/test/engine/test_parseconnect.py
+++ b/test/engine/test_parseconnect.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message, eq_
+from test.lib.testing import assert_raises, assert_raises_message, eq_
 import ConfigParser
 import StringIO
 import sqlalchemy.engine.url as url
 from sqlalchemy import create_engine, engine_from_config
 from sqlalchemy.engine import _coerce_config
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase
+from test.lib import TestBase
 
 
 class ParseConnectTest(TestBase):
diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
index 9db65d2ab8..a278b563a9 100644
--- a/test/engine/test_pool.py
+++ b/test/engine/test_pool.py
@@ -1,9 +1,9 @@
 import threading, time
 from sqlalchemy import pool, interfaces, create_engine, select
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing
-from sqlalchemy.test.util import gc_collect, lazy_gc
-from sqlalchemy.test.testing import eq_
+from test.lib import TestBase, testing
+from test.lib.util import gc_collect, lazy_gc
+from test.lib.testing import eq_
 
 mcid = 1
 class MockDBAPI(object):
diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py
index e264139579..7130b6b4fb 100644
--- a/test/engine/test_reconnect.py
+++ b/test/engine/test_reconnect.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 import time
 import weakref
 from sqlalchemy import select, MetaData, Integer, String, pool
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
-from sqlalchemy.test.util import gc_collect
+from test.lib import TestBase, testing, engines
+from test.lib.util import gc_collect
 from sqlalchemy import exc
 
 class MockDisconnect(Exception):
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index d0d6e31e13..cd1138985d 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -1,12 +1,12 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import StringIO, unicodedata
 from sqlalchemy import types as sql_types
 from sqlalchemy import schema
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy import MetaData
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as sa
-from sqlalchemy.test import TestBase, ComparesTables, \
+from test.lib import TestBase, ComparesTables, \
                             testing, engines, AssertsCompiledSQL
 
 create_inspector = Inspector.from_engine
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index f09c671641..c21fc96429 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 import sys
 import time
 import threading
 from sqlalchemy import create_engine, MetaData, INT, VARCHAR, Sequence, \
     select, Integer, String, func, text, exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
-from sqlalchemy.test import TestBase, testing
+from test.lib.schema import Table
+from test.lib.schema import Column
+from test.lib import TestBase, testing
 
 
 users, metadata = None, None
diff --git a/test/ex/test_examples.py b/test/ex/test_examples.py
index 9c68f18259..311eab0413 100644
--- a/test/ex/test_examples.py
+++ b/test/ex/test_examples.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test import *
+from test.lib import *
 import os
 import re
 
diff --git a/test/ext/test_associationproxy.py b/test/ext/test_associationproxy.py
index d22e457960..fb2f60ff1f 100644
--- a/test/ext/test_associationproxy.py
+++ b/test/ext/test_associationproxy.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 import copy
 import pickle
 
@@ -7,8 +7,8 @@ from sqlalchemy.orm import *
 from sqlalchemy.orm.collections import collection
 from sqlalchemy.ext.associationproxy import *
 from sqlalchemy.ext.associationproxy import _AssociationList
-from sqlalchemy.test import *
-from sqlalchemy.test.util import gc_collect
+from test.lib import *
+from test.lib.util import gc_collect
 from sqlalchemy.sql import not_
 from test.orm import _base
 
diff --git a/test/ext/test_compiler.py b/test/ext/test_compiler.py
index 3ed84fe61c..31b893b483 100644
--- a/test/ext/test_compiler.py
+++ b/test/ext/test_compiler.py
@@ -5,7 +5,7 @@ from sqlalchemy.sql.expression import ClauseElement, ColumnClause,\
 from sqlalchemy.schema import DDLElement
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql import table, column
-from sqlalchemy.test import *
+from test.lib import *
 
 class UserDefinedTest(TestBase, AssertsCompiledSQL):
 
diff --git a/test/ext/test_declarative.py b/test/ext/test_declarative.py
index 72e2edf30e..89e8e91080 100644
--- a/test/ext/test_declarative.py
+++ b/test/ext/test_declarative.py
@@ -1,17 +1,17 @@
 
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy.ext import declarative as decl
 from sqlalchemy import exc
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import MetaData, Integer, String, ForeignKey, \
     ForeignKeyConstraint, asc, Index
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import relationship, create_session, class_mapper, \
     joinedload, compile_mappers, backref, clear_mappers, \
     polymorphic_union, deferred, column_property
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy.util import classproperty
 from test.orm._base import ComparableEntity, MappedTest
 from sqlalchemy.ext.declarative import declared_attr
diff --git a/test/ext/test_horizontal_shard.py b/test/ext/test_horizontal_shard.py
index 66583fb0db..bbd4ed2e7d 100644
--- a/test/ext/test_horizontal_shard.py
+++ b/test/ext/test_horizontal_shard.py
@@ -4,8 +4,8 @@ from sqlalchemy import sql
 from sqlalchemy.orm import *
 from sqlalchemy.ext.horizontal_shard import ShardedSession
 from sqlalchemy.sql import operators
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_
+from test.lib import *
+from test.lib.testing import eq_
 from nose import SkipTest
 
 # TODO: ShardTest can be turned into a base for further subclasses
diff --git a/test/ext/test_orderinglist.py b/test/ext/test_orderinglist.py
index 559aefd1d9..f7f8f7fa76 100644
--- a/test/ext/test_orderinglist.py
+++ b/test/ext/test_orderinglist.py
@@ -1,8 +1,8 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.ext.orderinglist import *
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test import *
+from test.lib.testing import eq_
+from test.lib import *
 
 
 metadata = None
diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py
index 45f55e1c95..09a6504a3c 100644
--- a/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@ -2,14 +2,14 @@
 from sqlalchemy.ext import serializer
 from sqlalchemy import exc
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import MetaData, Integer, String, ForeignKey, select, \
     desc, func, util
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import relationship, sessionmaker, scoped_session, \
     class_mapper, mapper, joinedload, compile_mappers, aliased
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm._base import ComparableEntity, MappedTest
 
 
diff --git a/test/ext/test_sqlsoup.py b/test/ext/test_sqlsoup.py
index 7fe8ab1782..f0ac6cbed1 100644
--- a/test/ext/test_sqlsoup.py
+++ b/test/ext/test_sqlsoup.py
@@ -1,5 +1,5 @@
 from sqlalchemy.ext import sqlsoup
-from sqlalchemy.test.testing import TestBase, eq_, assert_raises
+from test.lib.testing import TestBase, eq_, assert_raises
 from sqlalchemy import create_engine, or_, desc, select, func, exc, \
     Table, util
 from sqlalchemy.orm import scoped_session, sessionmaker
diff --git a/lib/sqlalchemy/test/__init__.py b/test/lib/__init__.py
similarity index 77%
rename from lib/sqlalchemy/test/__init__.py
rename to test/lib/__init__.py
index e82b3ac914..452848aff1 100644
--- a/lib/sqlalchemy/test/__init__.py
+++ b/test/lib/__init__.py
@@ -7,9 +7,9 @@ by noseplugin.NoseSQLAlchemy.
 """
 
 from test.bootstrap import config
-from sqlalchemy.test import testing, engines, requires, profiling, pickleable
-from sqlalchemy.test.schema import Column, Table
-from sqlalchemy.test.testing import \
+from test.lib import testing, engines, requires, profiling, pickleable
+from test.lib.schema import Column, Table
+from test.lib.testing import \
      AssertsCompiledSQL, \
      AssertsExecutionResults, \
      ComparesTables, \
diff --git a/lib/sqlalchemy/test/assertsql.py b/test/lib/assertsql.py
similarity index 100%
rename from lib/sqlalchemy/test/assertsql.py
rename to test/lib/assertsql.py
diff --git a/lib/sqlalchemy/test/engines.py b/test/lib/engines.py
similarity index 99%
rename from lib/sqlalchemy/test/engines.py
rename to test/lib/engines.py
index d18b8c8cf3..61c5fb8fc5 100644
--- a/lib/sqlalchemy/test/engines.py
+++ b/test/lib/engines.py
@@ -128,7 +128,7 @@ def testing_engine(url=None, options=None):
     """Produce an engine configured by --options with optional overrides."""
 
     from sqlalchemy import create_engine
-    from sqlalchemy.test.assertsql import asserter
+    from test.lib.assertsql import asserter
 
     url = url or config.db_url
     options = options or config.db_opts
diff --git a/lib/sqlalchemy/test/entities.py b/test/lib/entities.py
similarity index 100%
rename from lib/sqlalchemy/test/entities.py
rename to test/lib/entities.py
diff --git a/lib/sqlalchemy/test/orm.py b/test/lib/orm.py
similarity index 100%
rename from lib/sqlalchemy/test/orm.py
rename to test/lib/orm.py
diff --git a/lib/sqlalchemy/test/pickleable.py b/test/lib/pickleable.py
similarity index 100%
rename from lib/sqlalchemy/test/pickleable.py
rename to test/lib/pickleable.py
diff --git a/lib/sqlalchemy/test/profiling.py b/test/lib/profiling.py
similarity index 99%
rename from lib/sqlalchemy/test/profiling.py
rename to test/lib/profiling.py
index 6f839897d9..f6c21bde85 100644
--- a/lib/sqlalchemy/test/profiling.py
+++ b/test/lib/profiling.py
@@ -6,7 +6,7 @@ in a more fine-grained way than nose's profiling plugin.
 """
 
 import os, sys
-from sqlalchemy.test.util import function_named, gc_collect
+from test.lib.util import function_named, gc_collect
 from nose import SkipTest
 
 __all__ = 'profiled', 'function_call_count', 'conditional_call_count'
diff --git a/lib/sqlalchemy/test/requires.py b/test/lib/requires.py
similarity index 100%
rename from lib/sqlalchemy/test/requires.py
rename to test/lib/requires.py
diff --git a/lib/sqlalchemy/test/schema.py b/test/lib/schema.py
similarity index 98%
rename from lib/sqlalchemy/test/schema.py
rename to test/lib/schema.py
index d33d75e2c4..614e5863eb 100644
--- a/lib/sqlalchemy/test/schema.py
+++ b/test/lib/schema.py
@@ -2,7 +2,7 @@
 desired state for different backends.
 """
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import schema
 
 __all__ = 'Table', 'Column',
diff --git a/lib/sqlalchemy/test/testing.py b/test/lib/testing.py
similarity index 99%
rename from lib/sqlalchemy/test/testing.py
rename to test/lib/testing.py
index 46723baa04..da2a3dfd30 100644
--- a/lib/sqlalchemy/test/testing.py
+++ b/test/lib/testing.py
@@ -9,7 +9,7 @@ import warnings
 from cStringIO import StringIO
 
 from test.bootstrap import config
-from sqlalchemy.test import assertsql, util as testutil
+from test.lib import assertsql, util as testutil
 from sqlalchemy.util import function_named, py3k
 from engines import drop_all_tables
 
diff --git a/lib/sqlalchemy/test/util.py b/test/lib/util.py
similarity index 100%
rename from lib/sqlalchemy/test/util.py
rename to test/lib/util.py
diff --git a/test/orm/_base.py b/test/orm/_base.py
index 4d0031f5a8..4ccc101574 100644
--- a/test/orm/_base.py
+++ b/test/orm/_base.py
@@ -3,11 +3,11 @@ import sys
 import types
 import sqlalchemy as sa
 import sqlalchemy.exceptions as sa_exc
-from sqlalchemy.test import config, testing
-from sqlalchemy.test.testing import resolve_artifact_names, adict
-from sqlalchemy.test.engines import drop_all_tables
+from test.lib import config, testing
+from test.lib.testing import resolve_artifact_names, adict
+from test.lib.engines import drop_all_tables
 from sqlalchemy.util import function_named
-from sqlalchemy.test.entities import BasicEntity, ComparableEntity
+from test.lib.entities import BasicEntity, ComparableEntity
 
 Entity = BasicEntity
 
diff --git a/test/orm/_fixtures.py b/test/orm/_fixtures.py
index a8df63b4a3..8f128c287d 100644
--- a/test/orm/_fixtures.py
+++ b/test/orm/_fixtures.py
@@ -1,8 +1,8 @@
 from sqlalchemy import MetaData, Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import attributes
-from sqlalchemy.test.testing import fixture
+from test.lib.testing import fixture
 from test.orm import _base
 
 __all__ = ()
diff --git a/test/orm/inheritance/test_abc_inheritance.py b/test/orm/inheritance/test_abc_inheritance.py
index edbd476eca..08ab28a089 100644
--- a/test/orm/inheritance/test_abc_inheritance.py
+++ b/test/orm/inheritance/test_abc_inheritance.py
@@ -2,8 +2,8 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm.interfaces import ONETOMANY, MANYTOONE
 
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib import testing
+from test.lib.schema import Table, Column
 from test.orm import _base
 
 
diff --git a/test/orm/inheritance/test_abc_polymorphic.py b/test/orm/inheritance/test_abc_polymorphic.py
index 2dab59bb25..fb229003b7 100644
--- a/test/orm/inheritance/test_abc_polymorphic.py
+++ b/test/orm/inheritance/test_abc_polymorphic.py
@@ -4,7 +4,7 @@ from sqlalchemy.orm import *
 
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class ABCTest(_base.MappedTest):
     @classmethod
diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index c6dec16b7f..9d31556551 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -1,14 +1,14 @@
 import warnings
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc as sa_exc, util
 from sqlalchemy.orm import *
 from sqlalchemy.orm import exc as orm_exc
 
-from sqlalchemy.test import testing, engines
+from test.lib import testing, engines
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class O2MTest(_base.MappedTest):
     """deals with inheritance and one-to-many relationships"""
diff --git a/test/orm/inheritance/test_concrete.py b/test/orm/inheritance/test_concrete.py
index a2d79284c0..43ba36ace1 100644
--- a/test/orm/inheritance/test_concrete.py
+++ b/test/orm/inheritance/test_concrete.py
@@ -1,15 +1,15 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm import exc as orm_exc
-from sqlalchemy.test import *
+from test.lib import *
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
 from sqlalchemy.orm import attributes
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_
+from test.lib.schema import Table, Column
 
 
 class Employee(object):
diff --git a/test/orm/inheritance/test_magazine.py b/test/orm/inheritance/test_magazine.py
index 125a5629c6..307c54a9cc 100644
--- a/test/orm/inheritance/test_magazine.py
+++ b/test/orm/inheritance/test_magazine.py
@@ -1,10 +1,10 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.util import function_named
 from test.orm import _base
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class BaseObject(object):
     def __init__(self, *args, **kwargs):
diff --git a/test/orm/inheritance/test_manytomany.py b/test/orm/inheritance/test_manytomany.py
index 8390e2a1b7..f5e3e63a17 100644
--- a/test/orm/inheritance/test_manytomany.py
+++ b/test/orm/inheritance/test_manytomany.py
@@ -1,8 +1,8 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
 
 
diff --git a/test/orm/inheritance/test_poly_linked_list.py b/test/orm/inheritance/test_poly_linked_list.py
index e16c95555b..046cf4b345 100644
--- a/test/orm/inheritance/test_poly_linked_list.py
+++ b/test/orm/inheritance/test_poly_linked_list.py
@@ -2,8 +2,8 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 
 from test.orm import _base
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib import testing
+from test.lib.schema import Table, Column
 
 
 class PolymorphicCircularTest(_base.MappedTest):
diff --git a/test/orm/inheritance/test_polymorph.py b/test/orm/inheritance/test_polymorph.py
index eed2395d7f..8eeeeec50e 100644
--- a/test/orm/inheritance/test_polymorph.py
+++ b/test/orm/inheritance/test_polymorph.py
@@ -1,10 +1,10 @@
 """tests basic polymorphic mapper loading/saving, minimal relationships"""
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm import exc as orm_exc
-from sqlalchemy.test import Column, testing
+from test.lib import Column, testing
 from sqlalchemy.util import function_named
 from test.orm import _fixtures, _base
 
diff --git a/test/orm/inheritance/test_polymorph2.py b/test/orm/inheritance/test_polymorph2.py
index 9852e8b094..030b931a56 100644
--- a/test/orm/inheritance/test_polymorph2.py
+++ b/test/orm/inheritance/test_polymorph2.py
@@ -2,16 +2,16 @@
 inheritance setups for which we maintain compatibility.
 """
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy import util
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import TestBase, AssertsExecutionResults, testing
+from test.lib import TestBase, AssertsExecutionResults, testing
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_
+from test.lib.schema import Table, Column
 
 class AttrSettable(object):
     def __init__(self, **kwargs):
diff --git a/test/orm/inheritance/test_productspec.py b/test/orm/inheritance/test_productspec.py
index dc81d9245c..a1ecf25629 100644
--- a/test/orm/inheritance/test_productspec.py
+++ b/test/orm/inheritance/test_productspec.py
@@ -2,9 +2,9 @@ from datetime import datetime
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class InheritTest(_base.MappedTest):
     """tests some various inheritance round trips involving a particular set of polymorphic inheritance relationships"""
diff --git a/test/orm/inheritance/test_query.py b/test/orm/inheritance/test_query.py
index 9e944ca6fd..e7d4d618a9 100644
--- a/test/orm/inheritance/test_query.py
+++ b/test/orm/inheritance/test_query.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm import interfaces
@@ -6,10 +6,10 @@ from sqlalchemy import exc as sa_exc
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.engine import default
 
-from sqlalchemy.test import AssertsCompiledSQL, testing
+from test.lib import AssertsCompiledSQL, testing
 from test.orm import _base, _fixtures
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_
+from test.lib.schema import Table, Column
 
 class Company(_fixtures.Base):
     pass
diff --git a/test/orm/inheritance/test_selects.py b/test/orm/inheritance/test_selects.py
index 7c9920f6f8..5a7389386f 100644
--- a/test/orm/inheritance/test_selects.py
+++ b/test/orm/inheritance/test_selects.py
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm._fixtures import Base
 from test.orm._base import MappedTest
 
diff --git a/test/orm/inheritance/test_single.py b/test/orm/inheritance/test_single.py
index 2efde2b32a..a65851a5fc 100644
--- a/test/orm/inheritance/test_single.py
+++ b/test/orm/inheritance/test_single.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _fixtures
 from test.orm._base import MappedTest, ComparableEntity
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 
 class SingleInheritanceTest(testing.AssertsCompiledSQL, MappedTest):
diff --git a/test/orm/test_association.py b/test/orm/test_association.py
index c9b1584bb7..e681099c55 100644
--- a/test/orm/test_association.py
+++ b/test/orm/test_association.py
@@ -1,10 +1,10 @@
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 
 class AssociationTest(_base.MappedTest):
diff --git a/test/orm/test_assorted_eager.py b/test/orm/test_assorted_eager.py
index 0e389b74ba..050e39d820 100644
--- a/test/orm/test_assorted_eager.py
+++ b/test/orm/test_assorted_eager.py
@@ -6,11 +6,11 @@ Derived from mailing list-reported problems and trac tickets.
 import datetime
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 
diff --git a/test/orm/test_attributes.py b/test/orm/test_attributes.py
index 742e9d8747..cedfccd5bd 100644
--- a/test/orm/test_attributes.py
+++ b/test/orm/test_attributes.py
@@ -3,10 +3,10 @@ import sqlalchemy.orm.attributes as attributes
 from sqlalchemy.orm.collections import collection
 from sqlalchemy.orm.interfaces import AttributeExtension
 from sqlalchemy import exc as sa_exc
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, ne_, assert_raises
+from test.lib import *
+from test.lib.testing import eq_, ne_, assert_raises
 from test.orm import _base
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 from sqlalchemy.util import cmp, jython
 
 # global for pickling tests
diff --git a/test/orm/test_backref_mutations.py b/test/orm/test_backref_mutations.py
index 13b44e1bb6..53337c2049 100644
--- a/test/orm/test_backref_mutations.py
+++ b/test/orm/test_backref_mutations.py
@@ -9,14 +9,14 @@ UPDATE in the database.
 
 """
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import Integer, String, ForeignKey, Sequence, exc as sa_exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, class_mapper, backref, sessionmaker
 from sqlalchemy.orm import attributes, exc as orm_exc
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import eq_
+from test.lib import testing
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 class O2MCollectionTest(_fixtures.FixtureTest):
diff --git a/test/orm/test_bind.py b/test/orm/test_bind.py
index 9b1c20b605..bab9be428a 100644
--- a/test/orm/test_bind.py
+++ b/test/orm/test_bind.py
@@ -1,10 +1,10 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import MetaData, Integer
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, create_session
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
 
 
diff --git a/test/orm/test_cascade.py b/test/orm/test_cascade.py
index 75b9e22ec1..27f231b062 100644
--- a/test/orm/test_cascade.py
+++ b/test/orm/test_cascade.py
@@ -1,13 +1,13 @@
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import Integer, String, ForeignKey, Sequence, \
     exc as sa_exc
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     sessionmaker, class_mapper, backref, Session
 from sqlalchemy.orm import attributes, exc as orm_exc
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import eq_
+from test.lib import testing
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 
diff --git a/test/orm/test_collection.py b/test/orm/test_collection.py
index 730605a760..1e92d41558 100644
--- a/test/orm/test_collection.py
+++ b/test/orm/test_collection.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import sys
 from operator import and_
 
@@ -6,13 +6,13 @@ import sqlalchemy.orm.collections as collections
 from sqlalchemy.orm.collections import collection
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, text
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy import util, exc as sa_exc
 from sqlalchemy.orm import create_session, mapper, relationship, attributes
 from test.orm import _base
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 
 class Canary(sa.orm.interfaces.AttributeExtension):
     def __init__(self):
diff --git a/test/orm/test_compile.py b/test/orm/test_compile.py
index 101e4143a8..a4fd280a2c 100644
--- a/test/orm/test_compile.py
+++ b/test/orm/test_compile.py
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 from test.orm import _base
 
 
diff --git a/test/orm/test_cycles.py b/test/orm/test_cycles.py
index 26765244a7..e5e6579330 100644
--- a/test/orm/test_cycles.py
+++ b/test/orm/test_cycles.py
@@ -5,13 +5,13 @@ T1<->T2, with o2m or m2o between them, and a third T3 with o2m/m2o to one/both
 T1/T2.
 
 """
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, \
                             create_session, sessionmaker
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.assertsql import RegexSQL, ExactSQL, CompiledSQL, AllOf
+from test.lib.testing import eq_
+from test.lib.assertsql import RegexSQL, ExactSQL, CompiledSQL, AllOf
 from test.orm import _base
 
 
diff --git a/test/orm/test_defaults.py b/test/orm/test_defaults.py
index 9be8e6e560..8e0b689186 100644
--- a/test/orm/test_defaults.py
+++ b/test/orm/test_defaults.py
@@ -1,11 +1,11 @@
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 
 class TriggerDefaultsTest(_base.MappedTest):
diff --git a/test/orm/test_deprecations.py b/test/orm/test_deprecations.py
index 76c59d0296..2565105a64 100644
--- a/test/orm/test_deprecations.py
+++ b/test/orm/test_deprecations.py
@@ -5,10 +5,10 @@ modern (i.e. not deprecated) alternative to them.  The tests snippets here can
 be migrated directly to the wiki, docs, etc.
 
 """
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, func
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, relation, create_session, sessionmaker
 from test.orm import _base
 
diff --git a/test/orm/test_dynamic.py b/test/orm/test_dynamic.py
index c06f6918ad..c89503278d 100644
--- a/test/orm/test_dynamic.py
+++ b/test/orm/test_dynamic.py
@@ -1,12 +1,12 @@
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 import operator
 from sqlalchemy.orm import dynamic_loader, backref
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, desc, select, func
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, Query, attributes
 from sqlalchemy.orm.dynamic import AppenderMixin
-from sqlalchemy.test.testing import eq_, AssertsCompiledSQL, assert_raises_message
+from test.lib.testing import eq_, AssertsCompiledSQL, assert_raises_message
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
 
diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py
index b70ad0973a..aad69b1407 100644
--- a/test/orm/test_eager_relations.py
+++ b/test/orm/test_eager_relations.py
@@ -1,18 +1,18 @@
 """tests of joined-eager loaded attributes"""
 
-from sqlalchemy.test.testing import eq_, is_, is_not_
+from test.lib.testing import eq_, is_, is_not_
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.orm import joinedload, deferred, undefer, \
     joinedload_all, backref
 from sqlalchemy import Integer, String, Date, ForeignKey, and_, select, \
     func
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     lazyload, aliased
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
-from sqlalchemy.test.assertsql import CompiledSQL
+from test.lib.assertsql import CompiledSQL
 from test.orm import _base, _fixtures
 from sqlalchemy.util import OrderedDict as odict
 import datetime
diff --git a/test/orm/test_evaluator.py b/test/orm/test_evaluator.py
index af6a3f89e3..26f9f49c3e 100644
--- a/test/orm/test_evaluator.py
+++ b/test/orm/test_evaluator.py
@@ -1,11 +1,11 @@
 """Evluating SQL expressions on ORM objects"""
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import String, Integer, select
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 from sqlalchemy import and_, or_, not_
diff --git a/test/orm/test_expire.py b/test/orm/test_expire.py
index c8bdf1719e..93a3e198b2 100644
--- a/test/orm/test_expire.py
+++ b/test/orm/test_expire.py
@@ -1,12 +1,12 @@
 """Attribute/instance expiration, deferral of attributes, etc."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test.util import gc_collect
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib.util import gc_collect
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, exc as sa_exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
                         attributes, deferred, exc as orm_exc, defer, undefer,\
                         strategies, state, lazyload, backref
diff --git a/test/orm/test_extendedattr.py b/test/orm/test_extendedattr.py
index 4374b9ecb9..83839e77b2 100644
--- a/test/orm/test_extendedattr.py
+++ b/test/orm/test_extendedattr.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import pickle
 from sqlalchemy import util
 import sqlalchemy.orm.attributes as attributes
@@ -6,7 +6,7 @@ from sqlalchemy.orm.collections import collection
 from sqlalchemy.orm.attributes import set_attribute, get_attribute, del_attribute, is_instrumented
 from sqlalchemy.orm import clear_mappers
 from sqlalchemy.orm import InstrumentationManager
-from sqlalchemy.test import *
+from test.lib import *
 from test.orm import _base
 
 class MyTypesManager(InstrumentationManager):
diff --git a/test/orm/test_generative.py b/test/orm/test_generative.py
index 31b7be8cc0..440dc95542 100644
--- a/test/orm/test_generative.py
+++ b/test/orm/test_generative.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, MetaData, func
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 
diff --git a/test/orm/test_immediate_load.py b/test/orm/test_immediate_load.py
index f85208bff1..66794ad4be 100644
--- a/test/orm/test_immediate_load.py
+++ b/test/orm/test_immediate_load.py
@@ -1,8 +1,8 @@
 """basic tests of lazy loaded attributes"""
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.orm import mapper, relationship, create_session, immediateload
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _fixtures
 
 
diff --git a/test/orm/test_instrumentation.py b/test/orm/test_instrumentation.py
index b0c9654701..0495ae20b1 100644
--- a/test/orm/test_instrumentation.py
+++ b/test/orm/test_instrumentation.py
@@ -1,11 +1,11 @@
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
 from sqlalchemy import MetaData, Integer, ForeignKey, util
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, attributes, class_mapper, clear_mappers
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 from sqlalchemy.util import function_named
 from test.orm import _base
 
diff --git a/test/orm/test_lazy_relations.py b/test/orm/test_lazy_relations.py
index f6147a3ebf..1bf7eecaf8 100644
--- a/test/orm/test_lazy_relations.py
+++ b/test/orm/test_lazy_relations.py
@@ -1,17 +1,17 @@
 """basic tests of lazy loaded attributes"""
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import datetime
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import attributes, exc as orm_exc
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, SmallInteger
 from sqlalchemy.types import TypeDecorator
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 
diff --git a/test/orm/test_lazytest1.py b/test/orm/test_lazytest1.py
index 3a96f430bb..15f56e618a 100644
--- a/test/orm/test_lazytest1.py
+++ b/test/orm/test_lazytest1.py
@@ -1,8 +1,8 @@
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
 
diff --git a/test/orm/test_load_on_fks.py b/test/orm/test_load_on_fks.py
index 8e4f53b0d1..3e7ddb8c2a 100644
--- a/test/orm/test_load_on_fks.py
+++ b/test/orm/test_load_on_fks.py
@@ -2,11 +2,11 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.test.testing import TestBase, eq_, AssertsExecutionResults, assert_raises
-from sqlalchemy.test import testing
+from test.lib.testing import TestBase, eq_, AssertsExecutionResults, assert_raises
+from test.lib import testing
 from sqlalchemy.orm.attributes import instance_state
 from sqlalchemy.orm.exc import FlushError
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 engine = testing.db
 
diff --git a/test/orm/test_manytomany.py b/test/orm/test_manytomany.py
index 1b5c5f7ac2..e8660ac6a0 100644
--- a/test/orm/test_manytomany.py
+++ b/test/orm/test_manytomany.py
@@ -1,10 +1,10 @@
-from sqlalchemy.test.testing import assert_raises, \
+from test.lib.testing import assert_raises, \
     assert_raises_message, eq_
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     exc as orm_exc, sessionmaker
 from test.orm import _base
diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py
index f041c8896b..f60d5a871d 100644
--- a/test/orm/test_mapper.py
+++ b/test/orm/test_mapper.py
@@ -1,16 +1,16 @@
 """General mapper operations with an emphasis on selecting/loading."""
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing, pickleable
+from test.lib import testing, pickleable
 from sqlalchemy import MetaData, Integer, String, ForeignKey, func, util
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.engine import default
 from sqlalchemy.orm import mapper, relationship, backref, create_session, class_mapper, compile_mappers, reconstructor, validates, aliased
 from sqlalchemy.orm import defer, deferred, synonym, attributes, column_property, composite, relationship, dynamic_loader, comparable_property,AttributeExtension
-from sqlalchemy.test.testing import eq_, AssertsCompiledSQL
+from test.lib.testing import eq_, AssertsCompiledSQL
 from test.orm import _base, _fixtures
-from sqlalchemy.test.assertsql import AllOf, CompiledSQL
+from test.lib.assertsql import AllOf, CompiledSQL
 
 
 class MapperTest(_fixtures.FixtureTest):
diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py
index d63d7e086e..47c4f0963f 100644
--- a/test/orm/test_merge.py
+++ b/test/orm/test_merge.py
@@ -1,16 +1,16 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
 from sqlalchemy import Integer, PickleType, String
 import operator
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.util import OrderedSet
 from sqlalchemy.orm import mapper, relationship, create_session, PropComparator, \
                             synonym, comparable_property, sessionmaker, attributes
 from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.orm.interfaces import MapperOption
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 from test.orm import _base, _fixtures
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class MergeTest(_fixtures.FixtureTest):
     """Session.merge() functionality"""
diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py
index ca88251d76..f9ce7b3cab 100644
--- a/test/orm/test_naturalpks.py
+++ b/test/orm/test_naturalpks.py
@@ -2,15 +2,15 @@
 Primary key changing capabilities and passive/non-passive cascading updates.
 
 """
-from sqlalchemy.test.testing import eq_, ne_, \
+from test.lib.testing import eq_, ne_, \
                         assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, Unicode
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, backref, Session
 from sqlalchemy.orm.session import make_transient
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 class NaturalPKTest(_base.MappedTest):
@@ -862,7 +862,7 @@ class CascadeToFKPKTest(_base.MappedTest, testing.AssertsCompiledSQL):
         sess.add(u2)
         sess.add(a2)
 
-        from sqlalchemy.test.assertsql import CompiledSQL
+        from test.lib.assertsql import CompiledSQL
         
         # test that the primary key columns of addresses are not
         # being updated as well, since this is a row switch.
diff --git a/test/orm/test_onetoone.py b/test/orm/test_onetoone.py
index 4e3cade9bf..7097a266ee 100644
--- a/test/orm/test_onetoone.py
+++ b/test/orm/test_onetoone.py
@@ -1,7 +1,7 @@
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
 
diff --git a/test/orm/test_pickled.py b/test/orm/test_pickled.py
index 5b87b2b85a..7119b87538 100644
--- a/test/orm/test_pickled.py
+++ b/test/orm/test_pickled.py
@@ -1,10 +1,10 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import pickle
 import sqlalchemy as sa
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import assert_raises_message
+from test.lib import testing
+from test.lib.testing import assert_raises_message
 from sqlalchemy import Integer, String, ForeignKey, exc, MetaData
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
                             sessionmaker, attributes, interfaces,\
                             clear_mappers, exc as orm_exc,\
diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index d96fa73846..758df6ee6d 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import operator
 from sqlalchemy import *
 from sqlalchemy import exc as sa_exc, util
@@ -7,10 +7,10 @@ from sqlalchemy.engine import default
 from sqlalchemy.orm import *
 from sqlalchemy.orm import attributes
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing, AssertsCompiledSQL, Column, engines
+from test.lib import testing, AssertsCompiledSQL, Column, engines
 
 from test.orm import _fixtures
 from test.orm._fixtures import keywords, addresses, Base, \
diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py
index 187c9e5349..eadf17b399 100644
--- a/test/orm/test_relationships.py
+++ b/test/orm/test_relationships.py
@@ -1,12 +1,12 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import datetime
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, MetaData, and_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, relation, \
                     backref, create_session, compile_mappers, clear_mappers, sessionmaker
-from sqlalchemy.test.testing import eq_, startswith_
+from test.lib.testing import eq_, startswith_
 from test.orm import _base, _fixtures
 
 
diff --git a/test/orm/test_scoping.py b/test/orm/test_scoping.py
index 1682e0f7e0..899dac1b03 100644
--- a/test/orm/test_scoping.py
+++ b/test/orm/test_scoping.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.orm import scoped_session
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, query
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 
diff --git a/test/orm/test_selectable.py b/test/orm/test_selectable.py
index e46d8bbc80..30278b5bcc 100644
--- a/test/orm/test_selectable.py
+++ b/test/orm/test_selectable.py
@@ -1,11 +1,11 @@
 """Generic mapping to Select statements"""
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import String, Integer, select
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 
diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index 6ac42a6b38..51e59d809b 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -1,18 +1,18 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 import inspect
 import pickle
 from sqlalchemy.orm import create_session, sessionmaker, attributes, \
     make_transient, Session
 from sqlalchemy.orm.attributes import instance_state
 import sqlalchemy as sa
-from sqlalchemy.test import engines, testing, config
+from test.lib import engines, testing, config
 from sqlalchemy import Integer, String, Sequence
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, joinedload, \
     exc as orm_exc, object_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.engine import _base as engine_base
 from test.orm import _base, _fixtures
 
diff --git a/test/orm/test_subquery_relations.py b/test/orm/test_subquery_relations.py
index 5eba68e139..2aadf26d46 100644
--- a/test/orm/test_subquery_relations.py
+++ b/test/orm/test_subquery_relations.py
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, is_, is_not_
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_, is_, is_not_
+from test.lib import testing
+from test.lib.schema import Table, Column
 from sqlalchemy import Integer, String, ForeignKey, bindparam
 from sqlalchemy.orm import backref, subqueryload, subqueryload_all, \
     mapper, relationship, clear_mappers, create_session, lazyload, \
     aliased, joinedload, deferred, undefer, eagerload_all
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
-from sqlalchemy.test.assertsql import CompiledSQL
+from test.lib.assertsql import CompiledSQL
 from test.orm import _base, _fixtures
 import sqlalchemy as sa
 
diff --git a/test/orm/test_transaction.py b/test/orm/test_transaction.py
index 2617f12f05..7f0ada49f2 100644
--- a/test/orm/test_transaction.py
+++ b/test/orm/test_transaction.py
@@ -1,12 +1,12 @@
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import attributes
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import exc as orm_exc
 from sqlalchemy.orm import *
-from sqlalchemy.test.util import gc_collect
-from sqlalchemy.test import testing
+from test.lib.util import gc_collect
+from test.lib import testing
 from test.orm import _base
 from test.orm._fixtures import FixtureTest, User, Address, users, addresses
 
diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index 52a93a122c..f228fb7d9f 100644
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -1,22 +1,22 @@
 # coding: utf-8
 """Tests unitofwork operations."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import datetime
 import operator
 from sqlalchemy.orm import mapper as orm_mapper
 
 import sqlalchemy as sa
-from sqlalchemy.test import engines, testing, pickleable
+from test.lib import engines, testing, pickleable
 from sqlalchemy import Integer, String, ForeignKey, literal_column
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     column_property, attributes, Session, reconstructor, object_session
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 from test.orm import _base, _fixtures
 from test.engine import _base as engine_base
-from sqlalchemy.test.assertsql import AllOf, CompiledSQL
+from test.lib.assertsql import AllOf, CompiledSQL
 import gc
 
 class UnitOfWorkTest(object):
diff --git a/test/orm/test_unitofworkv2.py b/test/orm/test_unitofworkv2.py
index d917993053..73a884e0c1 100644
--- a/test/orm/test_unitofworkv2.py
+++ b/test/orm/test_unitofworkv2.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib import testing
+from test.lib.schema import Table, Column
 from sqlalchemy import Integer, String, ForeignKey, func
 from test.orm import _fixtures, _base
 from sqlalchemy.orm import mapper, relationship, backref, \
                             create_session, unitofwork, attributes
-from sqlalchemy.test.assertsql import AllOf, CompiledSQL
+from test.lib.assertsql import AllOf, CompiledSQL
 
 from test.orm._fixtures import keywords, addresses, Base, Keyword,  \
            Dingaling, item_keywords, dingalings, User, items,\
diff --git a/test/orm/test_utils.py b/test/orm/test_utils.py
index 8635ad2125..89861c78de 100644
--- a/test/orm/test_utils.py
+++ b/test/orm/test_utils.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy.orm import interfaces, util
 from sqlalchemy import Column
 from sqlalchemy import Integer
@@ -8,10 +8,10 @@ from sqlalchemy.orm import aliased
 from sqlalchemy.orm import mapper, create_session
 
 
-from sqlalchemy.test import TestBase, testing
+from test.lib import TestBase, testing
 
 from test.orm import _fixtures
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 
 class ExtensionCarrierTest(TestBase):
diff --git a/test/orm/test_versioning.py b/test/orm/test_versioning.py
index 6cb2bb9e2c..75f7fbb6e8 100644
--- a/test/orm/test_versioning.py
+++ b/test/orm/test_versioning.py
@@ -1,9 +1,9 @@
 import sqlalchemy as sa
-from sqlalchemy.test import engines, testing
+from test.lib import engines, testing
 from sqlalchemy import Integer, String, ForeignKey, literal_column, orm, exc
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, column_property, sessionmaker
-from sqlalchemy.test.testing import eq_, ne_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, ne_, assert_raises, assert_raises_message
 from test.orm import _base, _fixtures
 from test.engine import _base as engine_base
 
diff --git a/test/perf/insertspeed.py b/test/perf/insertspeed.py
index 0491e9f959..3ae1ccbde5 100644
--- a/test/perf/insertspeed.py
+++ b/test/perf/insertspeed.py
@@ -2,7 +2,7 @@ import testenv; testenv.simple_setup()
 import sys, time
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import profiling
+from test.lib import profiling
 
 db = create_engine('sqlite://')
 metadata = MetaData(db)
diff --git a/test/perf/large_flush.py b/test/perf/large_flush.py
index 431a289449..b23de080ce 100644
--- a/test/perf/large_flush.py
+++ b/test/perf/large_flush.py
@@ -3,7 +3,7 @@ from sqlalchemy import create_engine, MetaData, orm
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy import Integer, String
 from sqlalchemy.orm import mapper
-from sqlalchemy.test import profiling
+from test.lib import profiling
 
 class Object(object):
     pass
diff --git a/test/perf/masscreate2.py b/test/perf/masscreate2.py
index e525fcf99d..6ad2194cdb 100644
--- a/test/perf/masscreate2.py
+++ b/test/perf/masscreate2.py
@@ -3,7 +3,7 @@ import testenv; testenv.simple_setup()
 import random, string
 
 from sqlalchemy.orm import attributes
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 
 # with this test, run top.  make sure the Python process doenst grow in size arbitrarily.
 
diff --git a/test/perf/masseagerload.py b/test/perf/masseagerload.py
index 2ed8d2803b..6e6d86d548 100644
--- a/test/perf/masseagerload.py
+++ b/test/perf/masseagerload.py
@@ -1,6 +1,6 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import profiling
+from test.lib import profiling
 
 NUM = 500
 DIVISOR = 50
diff --git a/test/perf/massload.py b/test/perf/massload.py
index f6cde3adfd..06cfae7864 100644
--- a/test/perf/massload.py
+++ b/test/perf/massload.py
@@ -2,7 +2,7 @@ import time
 #import sqlalchemy.orm.attributes as attributes
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 
 """
 
diff --git a/test/perf/masssave.py b/test/perf/masssave.py
index 41acd12ccf..3c1547d389 100644
--- a/test/perf/masssave.py
+++ b/test/perf/masssave.py
@@ -2,7 +2,7 @@ import gc
 import types
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 
 
 NUM = 2500
diff --git a/test/perf/objselectspeed.py b/test/perf/objselectspeed.py
index 816643680b..126c9c707c 100644
--- a/test/perf/objselectspeed.py
+++ b/test/perf/objselectspeed.py
@@ -1,8 +1,8 @@
 import time, resource
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test.util import gc_collect
-from sqlalchemy.test import profiling
+from test.lib.util import gc_collect
+from test.lib import profiling
 
 db = create_engine('sqlite://')
 metadata = MetaData(db)
diff --git a/test/perf/objupdatespeed.py b/test/perf/objupdatespeed.py
index fad22189ab..078d95fa3b 100644
--- a/test/perf/objupdatespeed.py
+++ b/test/perf/objupdatespeed.py
@@ -1,8 +1,8 @@
 import time, resource
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
-from sqlalchemy.test.util import gc_collect
+from test.lib import *
+from test.lib.util import gc_collect
 
 
 NUM = 100
diff --git a/test/perf/ormsession.py b/test/perf/ormsession.py
index 0b01fc5a37..aff265ff19 100644
--- a/test/perf/ormsession.py
+++ b/test/perf/ormsession.py
@@ -3,8 +3,8 @@ from datetime import datetime
 
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
-from sqlalchemy.test.profiling import profiled
+from test.lib import *
+from test.lib.profiling import profiled
 
 class Item(object):
     def __repr__(self):
diff --git a/test/perf/poolload.py b/test/perf/poolload.py
index 62c66fbae6..345720f0cb 100644
--- a/test/perf/poolload.py
+++ b/test/perf/poolload.py
@@ -2,7 +2,7 @@
 import thread, time
 from sqlalchemy import *
 import sqlalchemy.pool as pool
-from sqlalchemy.test import testing
+from test.lib import testing
 
 db = create_engine(testing.db.url, pool_timeout=30, echo_pool=True)
 metadata = MetaData(db)
diff --git a/test/perf/sessions.py b/test/perf/sessions.py
index 4210732d6a..2fe4f758fc 100644
--- a/test/perf/sessions.py
+++ b/test/perf/sessions.py
@@ -1,8 +1,8 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test.compat import gc_collect
-from sqlalchemy.test import TestBase, AssertsExecutionResults, profiling, testing
+from test.lib.compat import gc_collect
+from test.lib import TestBase, AssertsExecutionResults, profiling, testing
 from test.orm import _fixtures
 
 # in this test we are specifically looking for time spent in the attributes.InstanceState.__cleanup() method.
diff --git a/test/perf/wsgi.py b/test/perf/wsgi.py
index 549c92ade8..27aa4a8c85 100644
--- a/test/perf/wsgi.py
+++ b/test/perf/wsgi.py
@@ -4,7 +4,7 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 import thread
-from sqlalchemy.test import *
+from test.lib import *
 
 port = 8000
 
diff --git a/test/sql/test_case_statement.py b/test/sql/test_case_statement.py
index 1a106ee5e1..7bc3ab31f3 100644
--- a/test/sql/test_case_statement.py
+++ b/test/sql/test_case_statement.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message, eq_
+from test.lib.testing import assert_raises, assert_raises_message, eq_
 import sys
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy import util, exc
 from sqlalchemy.sql import table, column
 
diff --git a/test/sql/test_columns.py b/test/sql/test_columns.py
index 3cbb01943a..95933b41b1 100644
--- a/test/sql/test_columns.py
+++ b/test/sql/test_columns.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc, sql
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy import Table, Column  # don't use testlib's wrappers
 
 
diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index 338a5491ee..788feb84df 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import datetime, re, operator
 from sqlalchemy import *
 from sqlalchemy import exc, sql, util
@@ -6,7 +6,7 @@ from sqlalchemy.sql import table, column, label, compiler
 from sqlalchemy.sql.expression import ClauseList
 from sqlalchemy.engine import default
 from sqlalchemy.databases import *
-from sqlalchemy.test import *
+from test.lib import *
 
 table1 = table('mytable',
     column('myid', Integer),
diff --git a/test/sql/test_constraints.py b/test/sql/test_constraints.py
index 69f29a9bd4..56c5c62052 100644
--- a/test/sql/test_constraints.py
+++ b/test/sql/test_constraints.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc, schema
-from sqlalchemy.test import *
-from sqlalchemy.test import config, engines
+from test.lib import *
+from test.lib import config, engines
 from sqlalchemy.engine import ddl
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.assertsql import AllOf, RegexSQL, ExactSQL, CompiledSQL
+from test.lib.testing import eq_
+from test.lib.assertsql import AllOf, RegexSQL, ExactSQL, CompiledSQL
 from sqlalchemy.dialects.postgresql import base as postgresql
 
 class ConstraintTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index f49e4d0d3e..7ec43f8d2b 100644
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import datetime
 from sqlalchemy import Sequence, Column, func
 from sqlalchemy.schema import CreateSequence, DropSequence
 from sqlalchemy.sql import select, text
 import sqlalchemy as sa
-from sqlalchemy.test import testing, engines
+from test.lib import testing, engines
 from sqlalchemy import MetaData, Integer, String, ForeignKey, Boolean, exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.testing import eq_
+from test.lib.schema import Table
+from test.lib.testing import eq_
 from test.sql import _base
 
 
diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index c9bb8348c7..396eaaf9ba 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import datetime
 from sqlalchemy import *
 from sqlalchemy.sql import table, column
 from sqlalchemy import databases, sql, util
 from sqlalchemy.sql.compiler import BIND_TEMPLATES
 from sqlalchemy.engine import default
-from sqlalchemy.test.engines import all_dialects
+from test.lib.engines import all_dialects
 from sqlalchemy import types as sqltypes
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.sql.functions import GenericFunction
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from decimal import Decimal as _python_Decimal
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.databases import *
 
 
diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py
index 5457c7a797..5454a0f09e 100644
--- a/test/sql/test_generative.py
+++ b/test/sql/test_generative.py
@@ -1,11 +1,11 @@
 from sqlalchemy import *
 from sqlalchemy.sql import table, column, ClauseElement
 from sqlalchemy.sql.expression import  _clone, _from_objects
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.sql.visitors import *
 from sqlalchemy import util
 from sqlalchemy.sql import util as sql_util
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 class TraversalTest(TestBase, AssertsExecutionResults):
     """test ClauseVisitor's traversal, particularly its ability to copy and modify
diff --git a/test/sql/test_labels.py b/test/sql/test_labels.py
index f67ba9855f..0f84c30a0f 100644
--- a/test/sql/test_labels.py
+++ b/test/sql/test_labels.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc as exceptions
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.engine import default
 
 IDENT_LENGTH = 29
diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index 410ff73a65..f59b340766 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import datetime
 from sqlalchemy import *
 from sqlalchemy import exc, sql, util
 from sqlalchemy.engine import default, base
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, assert_raises_message, assert_raises
-from sqlalchemy.test.schema import Table, Column
+from test.lib import *
+from test.lib.testing import eq_, assert_raises_message, assert_raises
+from test.lib.schema import Table, Column
 
 class QueryTest(TestBase):
 
diff --git a/test/sql/test_quote.py b/test/sql/test_quote.py
index 81a68ec74d..8f27a7b3c1 100644
--- a/test/sql/test_quote.py
+++ b/test/sql/test_quote.py
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import sql, schema
 from sqlalchemy.sql import compiler
-from sqlalchemy.test import *
+from test.lib import *
 
 class QuoteTest(TestBase, AssertsCompiledSQL):
     @classmethod
diff --git a/test/sql/test_returning.py b/test/sql/test_returning.py
index 332f4eef5d..632a739f1d 100644
--- a/test/sql/test_returning.py
+++ b/test/sql/test_returning.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
-from sqlalchemy.test import *
-from sqlalchemy.test.schema import Table, Column
+from test.lib import *
+from test.lib.schema import Table, Column
 from sqlalchemy.types import TypeDecorator
 
 class ReturningTest(TestBase, AssertsExecutionResults):
diff --git a/test/sql/test_rowcount.py b/test/sql/test_rowcount.py
index ccd0d8f5ea..ed40f28018 100644
--- a/test/sql/test_rowcount.py
+++ b/test/sql/test_rowcount.py
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class FoundRowsTest(TestBase, AssertsExecutionResults):
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index 5bebbe05f4..77acf896b6 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -1,9 +1,9 @@
 """Test various algorithmic properties of selectables."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.sql import util as sql_util, visitors
 from sqlalchemy import exc
 from sqlalchemy.sql import table, column, null
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 9938438913..bfadca7c91 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -1,18 +1,18 @@
 # coding: utf-8
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import decimal
 import datetime, os, re
 from sqlalchemy import *
 from sqlalchemy import exc, types, util, schema
 from sqlalchemy.sql import operators, column, table
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import sqlalchemy.engine.url as url
 from sqlalchemy.databases import *
-from sqlalchemy.test.schema import Table, Column
-from sqlalchemy.test import *
-from sqlalchemy.test.util import picklers
+from test.lib.schema import Table, Column
+from test.lib import *
+from test.lib.util import picklers
 from decimal import Decimal
-from sqlalchemy.test.util import round_decimal
+from test.lib.util import round_decimal
 
 
 class AdaptTest(TestBase):
diff --git a/test/sql/test_unicode.py b/test/sql/test_unicode.py
index a116d34cbd..2eda4ffa84 100644
--- a/test/sql/test_unicode.py
+++ b/test/sql/test_unicode.py
@@ -2,8 +2,8 @@
 """verrrrry basic unicode column name testing"""
 
 from sqlalchemy import *
-from sqlalchemy.test import *
-from sqlalchemy.test.engines import utf8_engine
+from test.lib import *
+from test.lib.engines import utf8_engine
 from sqlalchemy.sql import column
 
 class UnicodeSchemaTest(TestBase):
diff --git a/test/zblog/tables.py b/test/zblog/tables.py
index 4907259e18..3326c28fbe 100644
--- a/test/zblog/tables.py
+++ b/test/zblog/tables.py
@@ -1,7 +1,7 @@
 """application table metadata objects are described here."""
 
 from sqlalchemy import *
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 metadata = MetaData()
 
diff --git a/test/zblog/test_zblog.py b/test/zblog/test_zblog.py
index 8103cde8b0..ec6402a6ef 100644
--- a/test/zblog/test_zblog.py
+++ b/test/zblog/test_zblog.py
@@ -1,6 +1,6 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 from test.zblog import mappers, tables
 from test.zblog.user import *
 from test.zblog.blog import *