diff --git a/tests/Tgstation.Server.Tests/InstanceManagerTest.cs b/tests/Tgstation.Server.Tests/InstanceManagerTest.cs
index f94fbcb3d3..d83dbe8794 100644
--- a/tests/Tgstation.Server.Tests/InstanceManagerTest.cs
+++ b/tests/Tgstation.Server.Tests/InstanceManagerTest.cs
@@ -116,11 +116,11 @@ namespace Tgstation.Server.Tests
 				Path = initialPath
 			}, cancellationToken), ErrorCode.InstanceRelocateOnline).ConfigureAwait(false);
 
-			var testSuite1 = new InstanceTest(instanceManagerClient.CreateClient(firstTest), instanceManagerClient);
+			var instanceClient = instanceManagerClient.CreateClient(firstTest);
+			var testSuite1 = new InstanceTest(instanceClient, instanceManagerClient);
 			await testSuite1.RunTests(cancellationToken).ConfigureAwait(false);
 
 			//can regain permissions on instance without instance user
-			var instanceClient = instanceManagerClient.CreateClient(firstTest);
 			var ourInstanceUser = await instanceClient.Users.Read(cancellationToken).ConfigureAwait(false);
 			await instanceClient.Users.Delete(ourInstanceUser, cancellationToken).ConfigureAwait(false);
 
@@ -137,6 +137,10 @@ namespace Tgstation.Server.Tests
 
 			firstTest.Online = false;
 			firstTest = await instanceManagerClient.Update(firstTest, cancellationToken).ConfigureAwait(false);
+
+			// TODO: Re-enable the rest of these tests once https://github.com/tgstation/tgstation-server/issues/860 is dealt with
+			return;
+
 			await instanceManagerClient.Detach(firstTest, cancellationToken).ConfigureAwait(false);
 
 			var instanceAttachFileName = (string)typeof(InstanceController).GetField("InstanceAttachFileName", BindingFlags.NonPublic | BindingFlags.Static).GetValue(null);