diff --git a/.github/workflows/tests-linux.yml b/.github/workflows/tests-linux.yml
index 5a60d02822e..66fa55e6749 100644
--- a/.github/workflows/tests-linux.yml
+++ b/.github/workflows/tests-linux.yml
@@ -21,6 +21,7 @@ on:
       - "Formula/libtirpc.rb"
       - "Formula/linux-headers.rb"
       - "Formula/strace.rb"
+      - "Formula/valgrind.rb"
       - "Formula/wayland.rb"
       - "Formula/wayland-protocols.rb"
 jobs:
diff --git a/Formula/valgrind.rb b/Formula/valgrind.rb
index a7b7bb1aacc..52abb5acd81 100644
--- a/Formula/valgrind.rb
+++ b/Formula/valgrind.rb
@@ -1,24 +1,15 @@
 class Valgrind < Formula
   desc "Dynamic analysis tools (memory, debug, profiling)"
   homepage "https://www.valgrind.org/"
+  url "https://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2"
+  sha256 "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca"
   license "GPL-2.0"
 
-  stable do
-    url "https://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2"
-    sha256 "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca"
-
-    depends_on maximum_macos: :high_sierra
-  end
-
   livecheck do
     url "https://sourceware.org/pub/valgrind/"
     regex(/href=.*?valgrind[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 
-  bottle do
-    sha256 "7170a66beb19ccfd79d1559fe57c67fb4a6a7b6369775621f5073af6fea07ea8" => :high_sierra
-  end
-
   head do
     url "https://sourceware.org/git/valgrind.git"
 
@@ -27,17 +18,16 @@ class Valgrind < Formula
     depends_on "libtool" => :build
   end
 
-  # Valgrind needs vcpreload_core-*-darwin.so to have execute permissions.
-  # See #2150 for more information.
-  skip_clean "lib/valgrind"
+  depends_on :linux
 
   def install
     args = %W[
       --disable-dependency-tracking
       --prefix=#{prefix}
       --enable-only64bit
-      --build=amd64-darwin
+      --without-mpicc
     ]
+
     system "./autogen.sh" if build.head?
 
     system "./configure", *args
@@ -46,6 +36,6 @@ class Valgrind < Formula
   end
 
   test do
-    system "#{bin}/valgrind", "ls", "-l"
+    assert_match "usage", shell_output("#{bin}/valgrind --help")
   end
 end