diff --git a/.azure-pipelines/linux.yml b/.azure-pipelines/linux.yml
index 6965a15fc..e55980743 100644
--- a/.azure-pipelines/linux.yml
+++ b/.azure-pipelines/linux.yml
@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test.yml
   parameters:
diff --git a/.azure-pipelines/macos.yml b/.azure-pipelines/macos.yml
index 85c2a0246..9ad9edae8 100644
--- a/.azure-pipelines/macos.yml
+++ b/.azure-pipelines/macos.yml
@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test.yml
   parameters:
diff --git a/.azure-pipelines/windows.yml b/.azure-pipelines/windows.yml
index 9d1bf5385..f56b8f504 100644
--- a/.azure-pipelines/windows.yml
+++ b/.azure-pipelines/windows.yml
@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test-windows.yml
   parameters:
diff --git a/tests/conftest.py b/tests/conftest.py
index ffd9f4215..bf071c8de 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -63,10 +63,10 @@ def pytest_collection_modifyitems(config, items):
         if not hasattr(item, 'module'):  # e.g.: DoctestTextfile
             continue
 
-        # Mark network tests as flaky
-        if (item.get_closest_marker('network') is not None and
-                "CI" in os.environ):
-            item.add_marker(pytest.mark.flaky(reruns=3))
+        if "CI" in os.environ:
+            # Mark network tests as flaky
+            if item.get_closest_marker('network') is not None:
+                item.add_marker(pytest.mark.flaky(reruns=3, reruns_delay=2))
 
         if (item.get_closest_marker('fails_on_new_resolver') and
                 config.getoption("--new-resolver") and
diff --git a/tests/unit/test_build_env.py b/tests/functional/test_build_env.py
similarity index 100%
rename from tests/unit/test_build_env.py
rename to tests/functional/test_build_env.py