diff --git a/deps/rabbitmq_cli/lib/delete_vhost_command.ex b/deps/rabbitmq_cli/lib/delete_vhost_command.ex
new file mode 100644
index 0000000000..7c4157fdfb
--- /dev/null
+++ b/deps/rabbitmq_cli/lib/delete_vhost_command.ex
@@ -0,0 +1,30 @@
+## The contents of this file are subject to the Mozilla Public License
+## Version 1.1 (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License
+## at http://www.mozilla.org/MPL/
+##
+## Software distributed under the License is distributed on an "AS IS"
+## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+## the License for the specific language governing rights and
+## limitations under the License.
+##
+## The Original Code is RabbitMQ.
+##
+## The Initial Developer of the Original Code is GoPivotal, Inc.
+## Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
+
+
+defmodule DeleteVhostCommand do
+  def delete_vhost([], _), do: HelpCommand.help
+  def delete_vhost([_|_] = cmds, _) when length(cmds) != 1, do: HelpCommand.help
+  def delete_vhost([arg], %{node: node_name}) do
+    node_name
+    |> Helpers.parse_node
+    |> :rabbit_misc.rpc_call(:rabbit_vhost, :delete, [arg])
+  end
+
+  def usage() do
+    "delete_vhost <vhost>"
+  end
+end
+
diff --git a/deps/rabbitmq_cli/test/delete_vhost_command_test.exs b/deps/rabbitmq_cli/test/delete_vhost_command_test.exs
new file mode 100644
index 0000000000..df05b06b96
--- /dev/null
+++ b/deps/rabbitmq_cli/test/delete_vhost_command_test.exs
@@ -0,0 +1,70 @@
+## The contents of this file are subject to the Mozilla Public License
+## Version 1.1 (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License
+## at http://www.mozilla.org/MPL/
+##
+## Software distributed under the License is distributed on an "AS IS"
+## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+## the License for the specific language governing rights and
+## limitations under the License.
+##
+## The Original Code is RabbitMQ.
+##
+## The Initial Developer of the Original Code is GoPivotal, Inc.
+## Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
+
+
+defmodule DeleteVhostCommandTest do
+  use ExUnit.Case, async: false
+  import ExUnit.CaptureIO
+  import TestHelper
+
+  setup_all do
+    :net_kernel.start([:rabbitmqctl, :shortnames])
+    on_exit([], fn -> :net_kernel.stop() end)
+    :ok
+  end
+
+  setup context do
+    :net_kernel.connect_node(context[:target])
+    add_vhost(context[:vhost])
+
+    on_exit(context, fn ->
+      delete_vhost(context[:vhost])
+      :erlang.disconnect_node(context[:target])
+    end)
+    {:ok, opts: %{node: context[:target]}}
+  end
+
+  test "wrong number of arguments results in usage print" do
+    assert capture_io(fn ->
+      IO.puts DeleteVhostCommand.delete_vhost([], %{})
+    end) =~ ~r/Usage:/
+
+    assert capture_io(fn ->
+      DeleteVhostCommand.delete_vhost(["test", "extra"], %{})
+    end) =~ ~r/Usage:/
+  end
+
+  @tag target: get_rabbit_hostname, vhost: "test"
+  test "A valid name to an active RabbitMQ node is successful", context do
+    assert DeleteVhostCommand.delete_vhost([context[:vhost]], context[:opts]) == :ok
+  end
+
+  @tag target: get_rabbit_hostname, vhost: ""
+  test "An empty string to an active RabbitMQ node is successful", context do
+    assert DeleteVhostCommand.delete_vhost([context[:vhost]], context[:opts]) == :ok
+  end
+
+  @tag target: :jake@thedog, vhost: "irrelevant"
+  test "A call to invalid or inactive RabbitMQ node returns a nodedown", context do
+    assert DeleteVhostCommand.delete_vhost(["na"], context[:opts]) == {:badrpc, :nodedown}
+  end
+
+  @tag target: get_rabbit_hostname, vhost: "test"
+  test "Deleting the same host twice results in a host not found message", context do
+    DeleteVhostCommand.delete_vhost([context[:vhost]], context[:opts])
+    assert DeleteVhostCommand.delete_vhost([context[:vhost]], context[:opts]) == 
+      {:error, {:no_such_vhost, context[:vhost]}}
+  end
+end