diff --git a/Tests/FAnsiTests/CrossPlatformTests.cs b/Tests/FAnsiTests/CrossPlatformTests.cs
index d12a81c..56bf6b7 100644
--- a/Tests/FAnsiTests/CrossPlatformTests.cs
+++ b/Tests/FAnsiTests/CrossPlatformTests.cs
@@ -793,9 +793,15 @@ public void HorribleDatabaseAndTableNames(DatabaseType type,string horribleDatab
         var database = GetTestDatabase(type);
 
         SqlConnection.ClearAllPools();
+        //var db = database.Server.ExpectDatabase(horribleTableName);
+        //if (db.Exists())
+        //    db.Drop();
+        if (type == DatabaseType.PostgreSql)
+            database.Server.CreateDatabase(horribleDatabaseName);
 
         database = database.Server.ExpectDatabase(horribleDatabaseName);
-        database.Create(true);
+        if(type != DatabaseType.PostgreSql)
+            database.Create(true);
             
         SqlConnection.ClearAllPools();
 
@@ -918,9 +924,8 @@ public void HorribleColumnNames(DatabaseType type, string horribleDatabaseName,
         AssertCanCreateDatabases();
 
         var database = GetTestDatabase(type);
-
+        database.Server.CreateDatabase(horribleDatabaseName);
         database = database.Server.ExpectDatabase(horribleDatabaseName);
-        database.Create(true);
         Assert.That(database.GetRuntimeName(), Is.EqualTo(horribleDatabaseName).IgnoreCase);
 
         try