diff --git a/.travis.yml b/.travis.yml
index fc513458b..68b29b1e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ compiler:
 env:
  global:
   - secure: "YnhS+8n6B+uoyaYfaJ3Lei7cSJqHDPiKJCKFIF2c87YDfmCvAJke8QtE7IzjYDs7UFkTCM4ox+ph2bERUrxZbSCyEkHdjIZpKuMJfYWja/jgMqTMxdyOH9y8JLFbZsSXDIXDwqBlC6vVyl1fP90M35wuWcNTs6tctfVWVofEFbs="
+  - GITTEST_INVASIVE_FS_SIZE=1
  matrix:
   - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release"
   - OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON"
diff --git a/appveyor.yml b/appveyor.yml
index 8ac6728c3..d155485fd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,8 @@ branches:
   only:
   - master
 environment:
-  GITTEST_INVASIVE_FILESYSTEM: 1
+  GITTEST_INVASIVE_FS_STRUCTURE: 1
+  GITTEST_INVASIVE_FS_SIZE: 1
 
   matrix:
   - GENERATOR: "Visual Studio 11"
diff --git a/tests/filter/stream.c b/tests/filter/stream.c
index 4dafce42e..603f19494 100644
--- a/tests/filter/stream.c
+++ b/tests/filter/stream.c
@@ -214,7 +214,7 @@ void test_filter_stream__smallfile(void)
 /* optionally write a 500 MB file through the compression stream */
 void test_filter_stream__bigfile(void)
 {
-	if (!cl_getenv("GITTEST_INVASIVE_FILESYSTEM"))
+	if (!cl_getenv("GITTEST_INVASIVE_FS_SIZE"))
 		cl_skip();
 
 	test_stream(51200);
diff --git a/tests/repo/init.c b/tests/repo/init.c
index 91747c9f5..076156817 100644
--- a/tests/repo/init.c
+++ b/tests/repo/init.c
@@ -722,7 +722,7 @@ void test_repo_init__at_filesystem_root(void)
 	git_buf root = GIT_BUF_INIT;
 	int root_len;
 
-	if (!cl_getenv("GITTEST_INVASIVE_FILESYSTEM"))
+	if (!cl_getenv("GITTEST_INVASIVE_FS_STRUCTURE"))
 		cl_skip();
 
 	root_len = git_path_root(sandbox);