diff --git a/Library/Homebrew/test/language/go_spec.rb b/Library/Homebrew/test/language/go_spec.rb
new file mode 100644
index 0000000000..24db78594f
--- /dev/null
+++ b/Library/Homebrew/test/language/go_spec.rb
@@ -0,0 +1,15 @@
+require "language/go"
+
+describe Language::Go do
+  specify "#stage_deps" do
+    ENV.delete("HOMEBREW_DEVELOPER")
+
+    expect(described_class).to receive(:opoo).once
+
+    Dir.mktmpdir do |path|
+      shutup do
+        described_class.stage_deps [], path
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/language_go_test.rb b/Library/Homebrew/test/language_go_test.rb
deleted file mode 100644
index 692a5d2ccb..0000000000
--- a/Library/Homebrew/test/language_go_test.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: UTF-8 -*-
-
-require "testing_env"
-require "language/go"
-
-class LanguageGoTests < Homebrew::TestCase
-  def test_stage_deps_empty
-    if ARGV.homebrew_developer?
-      Language::Go.expects(:odie).once
-    else
-      Language::Go.expects(:opoo).once
-    end
-    mktmpdir do |path|
-      shutup { Language::Go.stage_deps [], path }
-    end
-  end
-end