diff --git a/tests/sample/Compute/v2/ServerTest.php b/tests/sample/Compute/v2/ServerTest.php
index 02e68772..b4abd48c 100644
--- a/tests/sample/Compute/v2/ServerTest.php
+++ b/tests/sample/Compute/v2/ServerTest.php
@@ -383,7 +383,7 @@ public function testResume(Server $server)
 
         require_once $this->sampleFile('servers/resume.php', ['{serverId}' => $server->id]);
 
-        $server->waitUntil('ACTIVE');
+        $server->waitUntil('ACTIVE', 300);
         $this->assertEquals('ACTIVE', $server->status);
 
         $this->deleteServer($server);
diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
index fb29b4ad..5236a647 100644
--- a/tests/sample/Compute/v2/VolumeAttachmentTest.php
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -11,7 +11,9 @@ public function testAttach(): VolumeAttachment
     {
         $server = $this->createServer();
 
-        // let's wait for the server to be completely up  - https://bugs.launchpad.net/nova/+bug/1998148
+        // let's wait for the server to be completely up
+        // https://bugs.launchpad.net/nova/+bug/1998148
+        // https://bugs.launchpad.net/nova/+bug/1960346
         sleep(10);
 
         $volume = $this->getCachedService(Service::class)->createVolume(