diff --git a/migrate/tests/fixture/shell.py b/migrate/tests/fixture/shell.py
index 51e3885..a724c9a 100644
--- a/migrate/tests/fixture/shell.py
+++ b/migrate/tests/fixture/shell.py
@@ -3,20 +3,26 @@
 
 import os
 import sys
+import logging
 
 from scripttest import TestFileEnvironment
 
 from migrate.tests.fixture.pathed import *
 
 
+log = logging.getLogger(__name__)
+
 class Shell(Pathed):
     """Base class for command line tests"""
 
     def setUp(self):
         super(Shell, self).setUp()
+        migrate_path = os.path.dirname(sys.executable)
+        # PATH to migrate development script folder
+        log.debug('PATH for ScriptTest: %s', migrate_path)
         self.env = TestFileEnvironment(
             base_path=os.path.join(self.temp_usable_dir, 'env'),
-            script_path=[os.path.dirname(sys.executable)], # PATH to migrate development script folder
+            script_path=[migrate_path],
         )
 
     def run_version(self, repos_path):
diff --git a/migrate/tests/versioning/test_schemadiff.py b/migrate/tests/versioning/test_schemadiff.py
index 0fb20fe..04d7087 100644
--- a/migrate/tests/versioning/test_schemadiff.py
+++ b/migrate/tests/versioning/test_schemadiff.py
@@ -7,7 +7,7 @@ from sqlalchemy import *
 from nose.tools import eq_
 
 from migrate.versioning import genmodel, schemadiff
-from migrate.changeset import schema
+from migrate.changeset import schema, SQLA_06
 
 from migrate.tests import fixture
 
@@ -100,7 +100,10 @@ class TestSchemaDiff(fixture.DB):
         if not self.engine.name == 'oracle':
             # Add data, later we'll make sure it's still present.
             result = self.engine.execute(self.table.insert(), id=1, name=u'mydata')
-            dataId = result.inserted_primary_key[0]
+            if SQLA_06:
+                dataId = result.inserted_primary_key[0]
+            else:
+                dataId = result.last_inserted_ids()[0]
 
         # Modify table in model (by removing it and adding it back to model) -- drop column data and add column data2.
         self.meta.remove(self.table)
@@ -124,7 +127,10 @@ class TestSchemaDiff(fixture.DB):
         
             # Add data, later we'll make sure it's still present.
             result = self.engine.execute(self.table.insert(), id=2, name=u'mydata2', data2=123)
-            dataId2 = result.last_inserted_ids()[0]
+            if SQLA_06:
+                dataId2 = result.inserted_primary_key[0]
+            else:
+                dataId2 = result.last_inserted_ids()[0]
         
         # Change column type in model.
         self.meta.remove(self.table)