4 files changed, 12 insertions, 11 deletions
diff --git a/tests/modeltests/multiple_databases/models.py b/tests/modeltests/multiple_databases/models.py
index ce0be8f6c1..97e91b429c 100644
--- a/tests/modeltests/multiple_databases/models.py
+++ b/tests/modeltests/multiple_databases/models.py
@@ -78,19 +78,20 @@ __test__ = {'API_TESTS': """
 >>> from django.db import connection, connections, _default, model_connection_name
 >>> from django.conf import settings
 
-# The default connection is in there, but let's ignore it
+# Connections are referenced by name
+>>> connections['_a']
+Connection: ...
+>>> connections['_b']
+Connection: ...
+
+# Let's see what connections are available.The default connection is
+# in there, but let's ignore it
 
 >>> non_default = connections.keys()
 >>> non_default.remove(_default)
 >>> non_default.sort()
 >>> non_default
 ['_a', '_b']
-
-# Each connection references its settings
->>> connections['_a'].settings.DATABASE_NAME == settings.OTHER_DATABASES['_a']['DATABASE_NAME']
-True
->>> connections['_b'].settings.DATABASE_NAME == settings.OTHER_DATABASES['_b']['DATABASE_NAME']
-True
     
 # Invalid connection names raise ImproperlyConfigured
 >>> connections['bad']
diff --git a/tests/regressiontests/ansi_sql/models.py b/tests/regressiontests/ansi_sql/models.py
index 625106f439..63dab57430 100644
--- a/tests/regressiontests/ansi_sql/models.py
+++ b/tests/regressiontests/ansi_sql/models.py
@@ -20,7 +20,7 @@ Set([<class 'regressiontests.ansi_sql.models.Car'>])
 # test pending relationships
 >>> builder.models_already_seen = set()
 >>> builder.get_create_table(Mod)
-([BoundStatement('CREATE TABLE "ansi_sql_mod" (..."car_id" integer NOT NULL,...);')], {<class 'regressiontests.ansi_sql.models.Car'>: [BoundStatement('ALTER TABLE "ansi_sql_mod" ADD CONSTRAINT ... FOREIGN KEY ("car_id") REFERENCES "ansi_sql_car" ("id");')]})
+([BoundStatement('CREATE TABLE "ansi_sql_mod" (..."car_id" integer NOT NULL,...);')], {<class 'regressiontests.ansi_sql.models.Car'>: [(<class 'regressiontests.ansi_sql.models.Mod'>, <django.db.models.fields.related.ForeignKey...>)]})
 >>> builder.models_already_seen = set()
 >>> builder.get_create_table(Car)
 ([BoundStatement('CREATE TABLE "ansi_sql_car" (...);')], {})
@@ -45,7 +45,7 @@ Set([<class 'regressiontests.ansi_sql.models.Car'>])
 # patch builder so that it looks for initial data where we want it to
 # >>> builder.get_initialdata_path = othertests_sql
 >>> builder.get_initialdata(Car)
-[BoundStatement('insert into ansi_sql_car (...)...values (...);')]
+[BoundStatement("insert into ansi_sql_car (...)...values (...);...")]
 
 # test drop
 >>> builder.get_drop_table(Mod)
diff --git a/tests/regressiontests/ansi_sql/sql/car.sql b/tests/regressiontests/ansi_sql/sql/car.sql
index 8a377aabfb..eaac52a102 100644
--- a/tests/regressiontests/ansi_sql/sql/car.sql
+++ b/tests/regressiontests/ansi_sql/sql/car.sql
@@ -1,2 +1,2 @@
 insert into ansi_sql_car (make, model, year, condition)
-       values ("Chevy", "Impala", 1966, "mint");
-\ No newline at end of file
+       values ('Chevy', 'Impala', 1966, 'mint');
diff --git a/tests/regressiontests/manager_schema_manipulation/tests.py b/tests/regressiontests/manager_schema_manipulation/tests.py
index 56befae7ce..d1f9f1d560 100644
--- a/tests/regressiontests/manager_schema_manipulation/tests.py
+++ b/tests/regressiontests/manager_schema_manipulation/tests.py
@@ -123,7 +123,7 @@
 >>> PA._default_manager.db.backend.supports_constraints = True
 >>> result = PA.objects.install()
 >>> result
-{<class 'regressiontests.manager_schema_manipulation.tests.PC'>: [BoundStatement('ALTER TABLE "msm_pa" ADD CONSTRAINT "id_refs_c_id..." FOREIGN KEY ("c_id") REFERENCES "msm_pc" ("id");')]}
+{<class 'regressiontests.manager_schema_manipulation.tests.PC'>: [(<class 'regressiontests.manager_schema_manipulation.tests.PA'>, <django.db.models.fields.related.ForeignKey ...>)]}
 
 # NOTE: restore real constraint flag
 >>> PA._default_manager.db.backend.supports_constraints = real_cnst