diff --git a/.gitignore b/.gitignore
index 92077daad..510e41c83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ neatlynx/__pycache__
 .idea
 cache
 *.pyc
+.env/
 
 cache
 .dvc.conf.lock
diff --git a/dvc/analytics.py b/dvc/analytics.py
index f0604aa88..de1a5c513 100644
--- a/dvc/analytics.py
+++ b/dvc/analytics.py
@@ -7,7 +7,7 @@ from dvc.logger import logger
 
 
 class Analytics(object):
-    URL = 'https://dddc07bh9f.execute-api.us-east-2.amazonaws.com/production'
+    URL = 'https://analytics.dvc.org'
     TIMEOUT_POST = 5
 
     USER_ID_FILE = 'user_id'
diff --git a/dvc/cli.py b/dvc/cli.py
index d515bd208..a503bdc65 100644
--- a/dvc/cli.py
+++ b/dvc/cli.py
@@ -111,7 +111,7 @@ def parse_args(argv=None):
                         action='store_true',
                         default=False,
                         help="Initiate dvc in directory that is "
-                             "not tracked by any scm tool(e.g. git).")
+                             "not tracked by any scm tool (e.g. git).")
     init_parser.add_argument(
                         '-f',
                         '--force',
diff --git a/dvc/project.py b/dvc/project.py
index 93edfd8a9..dcd307487 100644
--- a/dvc/project.py
+++ b/dvc/project.py
@@ -1219,6 +1219,10 @@ class Project(object):
         import colorama
 
         self.logger.info(
+            "\n"
+            "DVC has enabled anonymous aggregate usage analytics.\n"
+            "Read the analytics documentation (and how to opt-out) here:\n"
+            "{blue}https://dvc.org/doc/user-guide/analytics{nc}\n"
             "\n"
             "{yellow}What's next?{nc}\n"
             "{yellow}------------{nc}\n"
diff --git a/dvc/updater.py b/dvc/updater.py
index f2f9ebb3c..c2abb0de5 100644
--- a/dvc/updater.py
+++ b/dvc/updater.py
@@ -11,8 +11,7 @@ from dvc.utils import is_binary
 
 
 class Updater(object):  # pragma: no cover
-    URL = 'https://4ki8820rsf.execute-api.us-east-2.amazonaws.com/' \
-          'prod/latest-version'
+    URL = 'https://updater.dvc.org'
     UPDATER_FILE = 'updater'
     TIMEOUT = 24 * 60 * 60  # every day
     TIMEOUT_GET = 10
diff --git a/tests/test_data_cloud.py b/tests/test_data_cloud.py
index 4b94f6407..35b627de7 100644
--- a/tests/test_data_cloud.py
+++ b/tests/test_data_cloud.py
@@ -42,6 +42,9 @@ def _should_test_gcp():
     if os.getenv("DVC_TEST_GCP") == "true":
         return True
 
+    if not os.path.exists(TestDvc.GCP_CREDS_FILE):
+        return False
+
     creds = os.getenv("GOOGLE_APPLICATION_CREDENTIALS")
     if creds and os.getenv("GCP_CREDS"):
         if os.path.exists(creds):