diff --git a/Library/Homebrew/test/caveats_spec.rb b/Library/Homebrew/test/caveats_spec.rb
index 06cd17ad52..571e471016 100644
--- a/Library/Homebrew/test/caveats_spec.rb
+++ b/Library/Homebrew/test/caveats_spec.rb
@@ -124,7 +124,21 @@ describe Caveats do
         caveats = described_class.new(f).caveats
 
         expect(f.service?).to eq(true)
-        expect(caveats).to include("'#{f.bin}/php' 'test'")
+        expect(caveats).to include("#{f.bin}/php test")
+        expect(caveats).to include("background service")
+      end
+
+      it "wraps multi-word service parameters" do
+        f = formula do
+          url "foo-1.0"
+          service do
+            run [bin/"nginx", "-g", "daemon off;"]
+          end
+        end
+        caveats = described_class.new(f).caveats
+
+        expect(f.service?).to eq(true)
+        expect(caveats).to include("#{f.bin}/nginx -g 'daemon off;'")
         expect(caveats).to include("background service")
       end