diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/formatter_helpers.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/formatter_helpers.ex
index cd931d6a824d..da88db5b81ad 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/formatter_helpers.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/formatter_helpers.ex
@@ -6,7 +6,7 @@
 
 defmodule RabbitMQ.CLI.Formatters.FormatterHelpers do
   import RabbitCommon.Records
-  use Bitwise
+  import Bitwise
 
   @type error :: {:error, term()} | {:error, integer(), String.t() | [String.t()]}
 
diff --git a/deps/rabbitmq_cli/test/ctl/set_disk_free_limit_command_test.exs b/deps/rabbitmq_cli/test/ctl/set_disk_free_limit_command_test.exs
index e926b9e37c9b..ef3d2b309638 100644
--- a/deps/rabbitmq_cli/test/ctl/set_disk_free_limit_command_test.exs
+++ b/deps/rabbitmq_cli/test/ctl/set_disk_free_limit_command_test.exs
@@ -102,34 +102,53 @@ defmodule SetDiskFreeLimitCommandTest do
 
   @tag limit: 2_097_152
   test "run: a valid integer input returns an ok and sets the disk free limit", context do
+    set_disk_free_limit(@default_limit)
     assert @command.run([context[:limit]], context[:opts]) == :ok
+    Process.sleep(500)
     assert status()[:disk_free_limit] === context[:limit]
+
+    set_disk_free_limit(@default_limit)
   end
 
   @tag limit: 2_097_152.0
   test "run: a valid non-fractional float input returns an ok and sets the disk free limit",
        context do
+    set_disk_free_limit(@default_limit)
     assert @command.run([context[:limit]], context[:opts]) == :ok
+    Process.sleep(500)
     assert status()[:disk_free_limit] === round(context[:limit])
+
+    set_disk_free_limit(@default_limit)
   end
 
   @tag limit: 2_097_152.9
   test "run: a valid fractional float input returns an ok and sets the disk free limit",
        context do
+    set_disk_free_limit(@default_limit)
     assert @command.run([context[:limit]], context[:opts]) == :ok
+    Process.sleep(500)
     assert status()[:disk_free_limit] === context[:limit] |> Float.floor() |> round
+
+    set_disk_free_limit(@default_limit)
   end
 
   @tag limit: "2097152"
   test "run: an integer string input returns an ok and sets the disk free limit", context do
+    set_disk_free_limit(@default_limit)
     assert @command.run([context[:limit]], context[:opts]) == :ok
+    Process.sleep(500)
     assert status()[:disk_free_limit] === String.to_integer(context[:limit])
+
+    set_disk_free_limit(@default_limit)
   end
 
   @tag limit: "2MB"
   test "run: an valid unit string input returns an ok and changes the limit", context do
     assert @command.run([context[:limit]], context[:opts]) == :ok
+    Process.sleep(500)
     assert status()[:disk_free_limit] === 2_000_000
+
+    set_disk_free_limit(@default_limit)
   end
 
   ## ------------------------ run relative command -------------------------------------------