diff --git a/cli/tox.ini b/cli/tox.ini
index 008ee0a..b6993d4 100644
--- a/cli/tox.ini
+++ b/cli/tox.ini
@@ -15,7 +15,16 @@ deps =
   teamcity-messages
   -e..
 
+# We currently include '*' as a catch all even though we also whitelist
+# specific # environment variables we know we care about. We should audit this in
+# the near future.
 passenv =
+  *
+  HOME
+  USERPROFILE
+  HOMEPATH
+  HOMEDRIVE
+  OPENSSL_CONF
   DCOS_*
   CI_FLAGS
   CLI_TEST_SSH_KEY_PATH
diff --git a/tox.ini b/tox.ini
index 8c69e8c..37d61b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,16 @@ deps =
   pytest-cov
   teamcity-messages
 
+# We currently include '*' as a catch all even though we also whitelist
+# specific # environment variables we know we care about. We should audit this in
+# the near future.
 passenv =
+  *
+  HOME
+  USERPROFILE
+  HOMEPATH
+  HOMEDRIVE
+  OPENSSL_CONF
   DCOS_*
   CI_FLAGS
   CLI_TEST_SSH_KEY_PATH
diff --git a/tox.win.ini b/tox.win.ini
deleted file mode 100644
index 38ebed9..0000000
--- a/tox.win.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[tox]
-envlist = py35-unit
-toxworkdir={env:TOXWORKDIR:.tox}
-
-[testenv]
-setenv =
-  DCOS_CONFIG = {env:DCOS_CONFIG}
-
-passenv =
-  TEAMCITY_VERSION
-
-deps =
-  pytest
-  pytest-cov
-  pypiwin32
-  teamcity-messages
-
-[testenv:syntax]
-deps =
-  flake8
-  flake8-import-order==0.9.2
-  pep8-naming
-
-commands =
-  flake8 --verbose {env:CI_FLAGS:} dcos tests setup.py
-
-[testenv:py35-unit]
-commands =
-  py.test -vv {env:CI_FLAGS:} --cov {envsitepackagesdir}/dcos tests