diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f4377a1111..354cdacc57 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -203,8 +203,11 @@ if(WITH_PYTHON)
     TEST_FILES restarting/from_7.0.0/SnapIncrementalRestore-1.toml
                restarting/from_7.0.0/SnapIncrementalRestore-2.toml)
   add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/ConfigureTestRestart-1.toml
-               restarting/from_7.0.0/ConfigureTestRestart-2.toml)
+    TEST_FILES restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-1.toml
+               restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-2.toml)
+  add_fdb_test(
+    TEST_FILES restarting/from_7.1.0/ConfigureTestRestart-1.toml
+               restarting/from_7.1.0/ConfigureTestRestart-2.toml)
   add_fdb_test(
     TEST_FILES restarting/from_5.0.0_until_6.3.0/CycleTestRestart-1.txt
                restarting/from_5.0.0_until_6.3.0/CycleTestRestart-2.txt)
@@ -233,8 +236,8 @@ if(WITH_PYTHON)
     TEST_FILES restarting/from_7.0.0/UpgradeAndBackupRestore-1.toml
                restarting/from_7.0.0/UpgradeAndBackupRestore-2.toml)
   add_fdb_test(
-    TEST_FILES restarting/to_7.0.0/CycleTestRestart-1.toml
-               restarting/to_7.0.0/CycleTestRestart-2.toml)
+    TEST_FILES restarting/to_7.0.0/CycleTestRestart-1.txt
+               restarting/to_7.0.0/CycleTestRestart-2.txt)
   add_fdb_test(
     TEST_FILES restarting/from_7.0.0/SnapTestAttrition-1.txt
                restarting/from_7.0.0/SnapTestAttrition-2.txt)
diff --git a/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml b/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml
index 6321090c4e..efa3bae128 100644
--- a/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml
+++ b/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml
@@ -1,4 +1,3 @@
-[configuration]
 logAntiQuorum = 0
 
 [[test]] 
diff --git a/tests/restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-1.toml b/tests/restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-1.toml
new file mode 100644
index 0000000000..7e8dc022a9
--- /dev/null
+++ b/tests/restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-1.toml
@@ -0,0 +1,22 @@
+[[test]]
+testTitle='CloggedConfigureDatabaseTest'
+clearAfterTest=false
+
+    [[test.workload]]
+    testName='ConfigureDatabase'
+    testDuration=30.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=30.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=30.0
+    scale=0.1
+    clogginess=2.0
+
+    [[test.workload]]
+    testName='SaveAndKill'
+    restartInfoLocation='simfdb/restartInfo.ini'
+    testDuration=30.0
diff --git a/tests/restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-2.toml b/tests/restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-2.toml
new file mode 100644
index 0000000000..f97a9326a4
--- /dev/null
+++ b/tests/restarting/from_7.0.0_until_7.1.0/ConfigureTestRestart-2.toml
@@ -0,0 +1,17 @@
+[[test]]
+testTitle='CloggedConfigureDatabaseTest'
+runSetup=false
+
+    [[test.workload]]
+    testName='ConfigureDatabase'
+    testDuration=300.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=300.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=300.0
+    scale=0.1
+    clogginess=2.0
diff --git a/tests/restarting/from_7.0.0/ConfigureTestRestart-1.toml b/tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml
similarity index 100%
rename from tests/restarting/from_7.0.0/ConfigureTestRestart-1.toml
rename to tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml
diff --git a/tests/restarting/from_7.0.0/ConfigureTestRestart-2.toml b/tests/restarting/from_7.1.0/ConfigureTestRestart-2.toml
similarity index 100%
rename from tests/restarting/from_7.0.0/ConfigureTestRestart-2.toml
rename to tests/restarting/from_7.1.0/ConfigureTestRestart-2.toml
diff --git a/tests/restarting/to_7.0.0/CycleTestRestart-1.toml b/tests/restarting/to_7.0.0/CycleTestRestart-1.toml
deleted file mode 100644
index dbbaa68d93..0000000000
--- a/tests/restarting/to_7.0.0/CycleTestRestart-1.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[configuration]
-storageEngineExcludeTypes=[-1,-2]
-maxTLogVersion=6
-disableTss=true
-disableHostname=true
-
-[[test]]
-testTitle='Clogged'
-clearAfterTest=false
-
-    [[test.workload]]
-    testName='Cycle'
-    transactionsPerSecond=500.0
-    nodeCount=2500
-    testDuration=10.0
-    expectedRate=0
-
-    [[test.workload]]
-    testName='RandomClogging'
-    testDuration=10.0
-
-    [[test.workload]]
-    testName='Rollback'
-    meanDelay=10.0
-    testDuration=10.0
-
-    [[test.workload]]
-    testName='Attrition'
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=10.0
-
-    [[test.workload]]
-    testName='Attrition'
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=10.0
-
-    [[test.workload]]
-    testName='SaveAndKill'
-    restartInfoLocation='simfdb/restartInfo.ini'
-    testDuration=10.0
diff --git a/tests/restarting/to_7.0.0/CycleTestRestart-1.txt b/tests/restarting/to_7.0.0/CycleTestRestart-1.txt
new file mode 100644
index 0000000000..bcd80fa1e2
--- /dev/null
+++ b/tests/restarting/to_7.0.0/CycleTestRestart-1.txt
@@ -0,0 +1,33 @@
+storageEngineExcludeTypes=-1,-2
+maxTLogVersion=6
+disableTss=true
+testTitle=Clogged
+    clearAfterTest=false
+    testName=Cycle
+    transactionsPerSecond=500.0
+    nodeCount=2500
+    testDuration=10.0
+    expectedRate=0
+
+    testName=RandomClogging
+    testDuration=10.0
+
+    testName=Rollback
+    meanDelay=10.0
+    testDuration=10.0
+
+    testName=Attrition
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    testName=Attrition
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    testName=SaveAndKill
+    restartInfoLocation=simfdb/restartInfo.ini
+    testDuration=10.0
\ No newline at end of file
diff --git a/tests/restarting/to_7.0.0/CycleTestRestart-2.toml b/tests/restarting/to_7.0.0/CycleTestRestart-2.toml
deleted file mode 100644
index 1149a9b386..0000000000
--- a/tests/restarting/to_7.0.0/CycleTestRestart-2.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[configuration]
-storageEngineExcludeTypes=[-1,-2]
-maxTLogVersion=6
-disableTss=true
-disableHostname=true
-
-[[test]]
-testTitle='Clogged'
-
-    [[test.workload]]
-    runSetup=false
-    testName='Cycle'
-    transactionsPerSecond=2500.0
-    nodeCount=2500
-    testDuration=10.0
-    expectedRate=0
-
-    [[test.workload]]
-    testName='RandomClogging'
-    testDuration=10.0
-
-    [[test.workload]]
-    testName='Rollback'
-    meanDelay=10.0
-    testDuration=10.0
-
-    [[test.workload]]
-    testName='Attrition'
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=10.0
-
-    [[test.workload]]
-    testName='Attrition'
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=10.0
diff --git a/tests/restarting/to_7.0.0/CycleTestRestart-2.txt b/tests/restarting/to_7.0.0/CycleTestRestart-2.txt
new file mode 100644
index 0000000000..f11cf32d76
--- /dev/null
+++ b/tests/restarting/to_7.0.0/CycleTestRestart-2.txt
@@ -0,0 +1,28 @@
+storageEngineExcludeTypes=-1,-2
+maxTLogVersion=6
+disableTss=true
+testTitle=Clogged
+    runSetup=false
+    testName=Cycle
+    transactionsPerSecond=2500.0
+    nodeCount=2500
+    testDuration=10.0
+    expectedRate=0
+
+    testName=RandomClogging
+    testDuration=10.0
+
+    testName=Rollback
+    meanDelay=10.0
+    testDuration=10.0
+
+    testName=Attrition
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    testName=Attrition
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
\ No newline at end of file