diff --git a/soda/core/tests/helpers/data_source_fixture.py b/soda/core/tests/helpers/data_source_fixture.py
index 96f62cc65..aa780a748 100644
--- a/soda/core/tests/helpers/data_source_fixture.py
+++ b/soda/core/tests/helpers/data_source_fixture.py
@@ -79,10 +79,10 @@ def _create_schema_name(self):
         return schema_name
 
     def _test_session_starts(self):
-        self.data_source = self._create_test_data_source()
         self.schema_data_source = self._create_schema_data_source()
         self._drop_schema_if_exists()
         self._create_schema_if_not_exists()
+        self.data_source = self._create_test_data_source()
 
     def _create_schema_data_source(self) -> DataSource:
         configuration_dict = self._build_configuration_dict()
diff --git a/soda/oracle/tests/oracle_data_source_fixture.py b/soda/oracle/tests/oracle_data_source_fixture.py
index bceef3a91..e8a246473 100644
--- a/soda/oracle/tests/oracle_data_source_fixture.py
+++ b/soda/oracle/tests/oracle_data_source_fixture.py
@@ -48,7 +48,7 @@ def sql_test_table_row(row):
             return f"INSERT ALL {rows_sql} \n SELECT 1 FROM DUAL"
 
     def _create_schema_if_not_exists_sql(self):
-        casify = self.data_source.default_casify_system_name
+        casify = str.upper
         return f"""
         declare
             userexist integer;
@@ -64,7 +64,7 @@ def _create_schema_if_not_exists_sql(self):
         """
 
     def _drop_schema_if_exists_sql(self):
-        casify = self.data_source.default_casify_system_name
+        casify = str.upper
         return f"""
         declare
         userexist integer;