diff --git a/.appveyor.yml b/.appveyor.yml
index 25fc9b22c..3645702c9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,12 +5,6 @@ branches:
 platform: x86
 
 environment:
-  my_variable:
-  aws_access_key_id:
-    secure: N3zfVSEvKhLSg/wvtrT1ZIVl9/egvW6xqIoRDrOcvvrkvJM0VejDHb3R3BWUUftY
-  aws_secret_access_key:
-    secure: /XGu3uYneji4fwIaFIEzDln9bx7vWZiLb6yie1temPyIRK+NQlvyfGXHcKZ5Vm4teaG68pNvQKoYulUSem4NvQ==
-
   matrix:
 
     - PYTHON: "C:\\Python27"
diff --git a/tests/test_data_cloud.py b/tests/test_data_cloud.py
index d47c5f314..a16f2f0c4 100644
--- a/tests/test_data_cloud.py
+++ b/tests/test_data_cloud.py
@@ -99,15 +99,12 @@ class TestDataCloudAWS(TestDataCloudBase):
     TEST_REPO_REGION = 'us-east-2'
 
     def _should_test(self):
-        dvc_test_aws = os.getenv("DVC_TEST_AWS")
-        if dvc_test_aws == "true":
-            return True
-        elif dvc_test_aws == "false":
+        if os.name == 'nt':
             return False
 
-        if os.getenv("AWS_ACCESS_KEY_ID") and os.getenv("AWS_SECRET_ACCESS_KEY"):
+        if os.getenv("TRAVIS_PULL_REQUEST") == "false" and \
+           os.getenv("TRAVIS_SECURE_ENV_VARS") == "true":
             return True
-
         return False
 
     def _setup_cloud(self):
@@ -132,10 +129,12 @@ class TestDataCloudGCP(TestDataCloudBase):
     TEST_REPO_GCP_PROJECT='dvc-project'
 
     def _should_test(self):
-        if os.getenv("DVC_TEST_GCP") == "true":
-            return True
+        if os.name == 'nt':
+            return False
 
-        return False
+        if os.getenv("TRAVIS") == "true" or os.getenv("APPVEYOR") == "True" or os.getenv("DVC_TEST_GCP") != "true":
+            return False
+        return True
 
     def _setup_cloud(self):
         if not self._should_test():