diff --git a/tests/DMAPI/BasicOperation/Test.dm b/tests/DMAPI/BasicOperation/Test.dm
index 61edd05e23..128f03f750 100644
--- a/tests/DMAPI/BasicOperation/Test.dm
+++ b/tests/DMAPI/BasicOperation/Test.dm
@@ -60,8 +60,11 @@
 	sleep(150)
 	world.log << "Terminating..."
 	world.TgsEndProcess()
+	if(world.TgsAvailable())
+		FailTest("Expected TGS to not let us reach this point")
 
-	world.log << "You really shouldn't be able to read this"
+	del(world)
+	sleep(1)
 
 /world/Export(url)
 	log << "Export: [url]"
diff --git a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
index 19c3a4e740..a171568a46 100644
--- a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
+++ b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
@@ -754,12 +754,9 @@ namespace Tgstation.Server.Tests.Live.Instance
 			Assert.AreNotEqual(0, daemonStatus.ImmediateMemoryUsage.Value);
 
 			if (skipApiValidation)
-			{
 				Assert.IsFalse(daemonStatus.ClientCount.HasValue);
-				await instanceClient.DreamDaemon.Shutdown(cancellationToken);
-			}
-			else
-				await GracefulWatchdogShutdown(cancellationToken);
+
+			await GracefulWatchdogShutdown(cancellationToken);
 
 			daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken);
 			Assert.AreEqual(WatchdogStatus.Offline, daemonStatus.Status.Value);