diff --git a/tests/system/test_system.py b/tests/system/test_system.py
index a3e05997d75..944582dedbd 100644
--- a/tests/system/test_system.py
+++ b/tests/system/test_system.py
@@ -339,7 +339,7 @@ def test_create_database_pitr_invalid_retention_period(self):
         retention_period = "0d"
         ddl_statements = [
             "ALTER DATABASE {}"
-            " SET OPTIONS (version_retention_period = {})".format(
+            " SET OPTIONS (version_retention_period = '{}')".format(
                 temp_db_id, retention_period
             )
         ]
@@ -358,7 +358,7 @@ def test_create_database_pitr_success(self):
         retention_period = "7d"
         ddl_statements = [
             "ALTER DATABASE {}"
-            " SET OPTIONS (version_retention_period = {})".format(
+            " SET OPTIONS (version_retention_period = '{}')".format(
                 temp_db_id, retention_period
             )
         ]
@@ -386,7 +386,7 @@ def test_create_database_pitr_success(self):
                 "WHERE SCHEMA_NAME = '' AND OPTION_NAME = 'version_retention_period'"
             )
             for result in results:
-                self.assertEqual(result, retention_period)
+                self.assertEqual(result[0], retention_period)
 
     def test_table_not_found(self):
         temp_db_id = "temp_db" + unique_resource_id("_")
@@ -454,12 +454,11 @@ def test_update_database_ddl_pitr_invalid(self):
         # We want to make sure the operation completes.
         create_op.result(240)  # raises on failure / timeout.
 
-        temp_db.reload()
         self.assertIsNone(temp_db.version_retention_period)
 
         ddl_statements = DDL_STATEMENTS + [
             "ALTER DATABASE {}"
-            " SET OPTIONS (version_retention_period = {})".format(
+            " SET OPTIONS (version_retention_period = '{}')".format(
                 temp_db_id, retention_period
             )
         ]
@@ -480,12 +479,11 @@ def test_update_database_ddl_pitr_success(self):
         # We want to make sure the operation completes.
         create_op.result(240)  # raises on failure / timeout.
 
-        temp_db.reload()
         self.assertIsNone(temp_db.version_retention_period)
 
         ddl_statements = DDL_STATEMENTS + [
             "ALTER DATABASE {}"
-            " SET OPTIONS (version_retention_period = {})".format(
+            " SET OPTIONS (version_retention_period = '{}')".format(
                 temp_db_id, retention_period
             )
         ]