diff --git a/migrate/versioning/util/__init__.py b/migrate/versioning/util/__init__.py
index 8d4eb2d..08b6b6e 100644
--- a/migrate/versioning/util/__init__.py
+++ b/migrate/versioning/util/__init__.py
@@ -155,7 +155,8 @@ def with_engine(f, *a, **kw):
     engine = construct_engine(url, **kw)
 
     try:
-        return f(*a, engine=engine, **kw)
+        kw['engine'] = engine
+        return f(*a, **kw)
     finally:
         if isinstance(engine, Engine):
             log.debug('Disposing SQLAlchemy engine %s', engine)
diff --git a/tests/fixture/database.py b/tests/fixture/database.py
index 3de4c80..071e73a 100644
--- a/tests/fixture/database.py
+++ b/tests/fixture/database.py
@@ -10,6 +10,7 @@ from sqlalchemy.pool import StaticPool
 
 from migrate.changeset import SQLA_06
 from migrate.versioning.util import Memoize
+
 from tests.fixture.base import Base
 from tests.fixture.pathed import Pathed