diff --git a/spanner/tests/system/test_system.py b/spanner/tests/system/test_system.py
index d6516552cb25..5cde38d309fe 100644
--- a/spanner/tests/system/test_system.py
+++ b/spanner/tests/system/test_system.py
@@ -285,14 +285,14 @@ def test_create_database(self):
 
     def test_create_database_not_found(self):
         temp_db_id = 'temp_db' + unique_resource_id('_')
-        temp_db = Config.INSTANCE.database("bitemporal_pattern1", ddl_statements=[
-            """CREATE TABLE MyTable (
-                Id        String(36) NOT NULL,
-                Field1  STRING(36) NOT NULL
-            ) PRIMARY KEY (Id)""",
-            """CREATE INDEX IDX ON yTable (Field1)"""
+        temp_db = Config.INSTANCE.database(temp_db_id, ddl_statements=[
+            'CREATE TABLE MyTable ('
+            '    Id      STRING(36) NOT NULL,'
+            '    Field1  STRING(36) NOT NULL'
+            ') PRIMARY KEY (Id)',
+            'CREATE INDEX IDX ON yTable (Field1)'
         ])
-        with self.assertRaisesRegexp(NotFound, "Database not found"):
+        with self.assertRaisesRegexp(NotFound, 'Database not found: ' + temp_db_id):
             operation = temp_db.create()
 
     def test_update_database_ddl(self):