diff --git a/Library/Homebrew/test/cmd/unpack_spec.rb b/Library/Homebrew/test/cmd/unpack_spec.rb
new file mode 100644
index 0000000000..244fc08522
--- /dev/null
+++ b/Library/Homebrew/test/cmd/unpack_spec.rb
@@ -0,0 +1,16 @@
+describe "brew unpack", :integration_test do
+  it "unpacks a given Formula's archive" do
+    setup_test_formula "testball"
+
+    Dir.mktmpdir do |path|
+      path = Pathname.new(path)
+
+      shutup do
+        expect { brew "unpack", "testball", "--destdir=#{path}" }
+          .to be_a_success
+      end
+
+      expect(path/"testball-0.1").to be_a_directory
+    end
+  end
+end
diff --git a/Library/Homebrew/test/unpack_test.rb b/Library/Homebrew/test/unpack_test.rb
deleted file mode 100644
index bbff6ad1c4..0000000000
--- a/Library/Homebrew/test/unpack_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "testing_env"
-
-class IntegrationCommandTestUnpack < IntegrationCommandTestCase
-  def test_unpack
-    setup_test_formula "testball"
-
-    mktmpdir do |path|
-      cmd "unpack", "testball", "--destdir=#{path}"
-      assert File.directory?("#{path}/testball-0.1"),
-        "The tarball should be unpacked"
-    end
-  end
-end