diff --git a/Makefile b/Makefile
index 193319503557fe..44370baf562128 100644
--- a/Makefile
+++ b/Makefile
@@ -125,9 +125,6 @@ test: all
 test-parallel: all
 	$(PYTHON) tools/test.py --mode=release parallel -J
 
-test-valgrind: all
-	$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
-
 test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
 	$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
 		--python="$(PYTHON)" \
@@ -191,9 +188,6 @@ test-build: | all build-addons
 test-all: test-build test/gc/node_modules/weak/build/Release/weakref.node
 	$(PYTHON) tools/test.py --mode=debug,release
 
-test-all-valgrind: test-build
-	$(PYTHON) tools/test.py --mode=debug,release --valgrind
-
 CI_NATIVE_SUITES := addons
 CI_JS_SUITES := doctool inspector known_issues message parallel pseudo-tty sequential
 
diff --git a/test/message/testcfg.py b/test/message/testcfg.py
index 7183ab333d8274..39d5f4a3f97438 100644
--- a/test/message/testcfg.py
+++ b/test/message/testcfg.py
@@ -43,7 +43,7 @@ def __init__(self, path, file, expected, arch, mode, context, config):
     self.mode = mode
 
   def IgnoreLine(self, str):
-    """Ignore empty lines and valgrind output."""
+    """Ignore empty lines"""
     if not str.strip(): return True
     else: return str.startswith('==') or str.startswith('**')
 
diff --git a/test/pseudo-tty/testcfg.py b/test/pseudo-tty/testcfg.py
index 96b30253498857..e3c472b63354ef 100644
--- a/test/pseudo-tty/testcfg.py
+++ b/test/pseudo-tty/testcfg.py
@@ -44,7 +44,7 @@ def __init__(self, path, file, expected, arch, mode, context, config):
     self.mode = mode
 
   def IgnoreLine(self, str):
-    """Ignore empty lines and valgrind output."""
+    """Ignore empty lines"""
     if not str.strip(): return True
     else: return str.startswith('==') or str.startswith('**')
 
diff --git a/tools/run-valgrind.py b/tools/run-valgrind.py
deleted file mode 120000
index 07935ad7d4fc08..00000000000000
--- a/tools/run-valgrind.py
+++ /dev/null
@@ -1 +0,0 @@
-../deps/v8/tools/run-valgrind.py
\ No newline at end of file
diff --git a/tools/test.py b/tools/test.py
index d57988f24d608e..bdbbf847b62454 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1330,8 +1330,6 @@ def BuildOptions():
       default=[], action="append")
   result.add_option("--expect-fail", dest="expect_fail",
       help="Expect test cases to fail", default=False, action="store_true")
-  result.add_option("--valgrind", help="Run tests through valgrind",
-      default=False, action="store_true")
   result.add_option("--cat", help="Print the source of the tests",
       default=False, action="store_true")
   result.add_option("--flaky-tests",
@@ -1518,12 +1516,6 @@ def Main():
       path = SplitPath(arg)
       paths.append(path)
 
-  # Check for --valgrind option. If enabled, we overwrite the special
-  # command flag with a command that uses the run-valgrind.py script.
-  if options.valgrind:
-    run_valgrind = join(workspace, "tools", "run-valgrind.py")
-    options.special_command = "python -u " + run_valgrind + " @"
-
   shell = abspath(options.shell)
   buildspace = dirname(shell)