diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/discover_peers_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/discover_peers_command.ex
similarity index 93%
rename from deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/discover_peers_command.ex
rename to deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/discover_peers_command.ex
index dfeca23514..d113aee7b5 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/discover_peers_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/discover_peers_command.ex
@@ -14,11 +14,9 @@
 ## Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
 
 
-defmodule RabbitMQ.CLI.Ctl.Commands.DiscoverPeersCommand do
+defmodule RabbitMQ.CLI.Diagnostics.Commands.DiscoverPeersCommand do
   @behaviour RabbitMQ.CLI.CommandBehaviour
 
-  def scopes(), do: [:ctl, :diagnostics]
-
   def merge_defaults(args, opts), do: {args, opts}
 
   def validate([_|_], _) do
diff --git a/deps/rabbitmq_cli/test/discover_peers_command_test.exs b/deps/rabbitmq_cli/test/diagnostics/discover_peers_command_test.exs
similarity index 95%
rename from deps/rabbitmq_cli/test/discover_peers_command_test.exs
rename to deps/rabbitmq_cli/test/diagnostics/discover_peers_command_test.exs
index 2054833895..ebf8934a42 100644
--- a/deps/rabbitmq_cli/test/discover_peers_command_test.exs
+++ b/deps/rabbitmq_cli/test/diagnostics/discover_peers_command_test.exs
@@ -17,7 +17,7 @@ defmodule DiscoverPeersCommandTest do
   use ExUnit.Case, async: false
   import TestHelper
 
-  @command RabbitMQ.CLI.Ctl.Commands.DiscoverPeersCommand
+  @command RabbitMQ.CLI.Diagnostics.Commands.DiscoverPeersCommand
   setup_all do
     RabbitMQ.CLI.Core.Distribution.start()
     :net_kernel.connect_node(get_rabbit_hostname())