diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
index 3191641310..d764e80b1f 100644
--- a/gypfiles/standalone.gypi
+++ b/gypfiles/standalone.gypi
@@ -112,6 +112,9 @@
       'use_goma%': 0,
       'gomadir%': '',
 
+      # Check if valgrind directories are present.
+      'has_valgrind%': '<!pymod_do_main(has_valgrind)',
+
       'test_isolation_mode%': 'noop',
 
       'conditions': [
@@ -161,6 +164,7 @@
     'test_isolation_mode%': '<(test_isolation_mode)',
     'fastbuild%': '<(fastbuild)',
     'coverage%': '<(coverage)',
+    'has_valgrind%': '<(has_valgrind)',
 
     # Add a simple extras solely for the purpose of the cctests
     'v8_extra_library_files': ['../test/cctest/test-extra.js'],
diff --git a/gypfiles/toolchain.gypi b/gypfiles/toolchain.gypi
index 1d4158c7cf..f5f0289917 100644
--- a/gypfiles/toolchain.gypi
+++ b/gypfiles/toolchain.gypi
@@ -29,19 +29,6 @@
 
 {
   'variables': {
-    'variables': {
-      'variables': {
-        # Instrument for code coverage and use coverage wrapper to exclude some
-        # files. Uses gcov if clang=0 is set explicitly. Otherwise,
-        # sanitizer_coverage must be set too.
-        'coverage%': 0,
-      },
-
-      'coverage%': '<(coverage)',
-
-      # Check if valgrind directories are present.
-      'has_valgrind%': '<!pymod_do_main(has_valgrind)',
-    },
     'msvs_use_common_release': 0,
     'clang%': 0,
     'asan%': 0,
@@ -50,8 +37,6 @@
     'tsan%': 0,
     'ubsan%': 0,
     'ubsan_vptr%': 0,
-    'has_valgrind%': '<(has_valgrind)',
-    'coverage%': '<(coverage)',
     'v8_target_arch%': '<(target_arch)',
     'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
     # Native Client builds currently use the V8 ARM JIT and