diff --git a/tests/Functional/RedisCommandsTest.php b/tests/Functional/RedisCommandsTest.php
index adfdfa47f..176eb13c0 100644
--- a/tests/Functional/RedisCommandsTest.php
+++ b/tests/Functional/RedisCommandsTest.php
@@ -18,6 +18,8 @@ class RedisCommandsTest extends TerminusTestBase
      */
     public function testRedisEnable()
     {
+        // This usually runs right after site plan change, let's sleep for a bit before continuing.
+        sleep(5);
         $this->assertTerminusCommandSucceedsInAttempts(sprintf('redis:enable %s', $this->getSiteName()));
     }
 
diff --git a/tests/Functional/SelfCommandsTest.php b/tests/Functional/SelfCommandsTest.php
index daa60aace..2179f5cc7 100644
--- a/tests/Functional/SelfCommandsTest.php
+++ b/tests/Functional/SelfCommandsTest.php
@@ -27,7 +27,6 @@ public function testSelfUpdateCommand()
             0 !== $exitCode
             && false !== strpos($error, 'rate limit exceeded')
         ) {
-            // @todo: fix CMS-972
             $this->markTestSkipped(sprintf('Failed executing %s command: %s', self::SELF_UPDATE_COMMAND, $error));
         }
 
@@ -44,6 +43,14 @@ public function testSelfUpdateCommand()
             'Failed installing plugins to setup self:update command test.'
         );
         $output = $this->terminus(self::SELF_UPDATE_COMMAND);
+        [$output, $exitCode, $error] = static::callTerminus(self::SELF_UPDATE_COMMAND);
+        if (
+            0 !== $exitCode
+            && false !== strpos($error, 'rate limit exceeded')
+        ) {
+            $this->markTestSkipped(sprintf('Failed executing %s command: %s', self::SELF_UPDATE_COMMAND, $error));
+        }
+
         $this->assertEquals('No update available', $output);
     }
 }