diff --git a/.travis.yml b/.travis.yml
index c86579fe4..e368fab6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,12 @@ dist: trusty
 sudo: true
 
 env:
-  - NOVALGRIND=1
-  - NOVALGRIND=0
+  - NO_VALGRIND=1
+  - NO_VALGRIND=0
 
 # Trusty (aka 14.04) is way way too old, so run in docker...
 script:
   - docker pull cdecker/lightning-ci > /dev/null
   - docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci make -j3
-  - docker run --rm=true -e NOVALGRIND=${NOVALGRIND:-0} -e TEST_DEBUG=${TEST_DEBUG:-0} -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci make check
+  - docker run --rm=true -e NO_VALGRIND=${NO_VALGRIND:-0} -e TEST_DEBUG=${TEST_DEBUG:-0} -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci make check
   - docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci make check-source
diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py
index 9f0928d86..a800087f7 100644
--- a/tests/test_lightningd.py
+++ b/tests/test_lightningd.py
@@ -21,7 +21,7 @@ import utils
 
 bitcoind = None
 TEST_DIR = tempfile.mkdtemp(prefix='lightning-')
-VALGRIND = os.getenv("NOVALGRIND", "0") == "0"
+VALGRIND = os.getenv("NO_VALGRIND", "0") == "0"
 TEST_DEBUG = os.getenv("TEST_DEBUG", "0") == "1"
 
 print("Testing results are in {}".format(TEST_DIR))