diff --git a/.github/workflows/ci_consumption_workflow.yml b/.github/workflows/ci_consumption_workflow.yml
index aaa30ced4..22a83a20d 100644
--- a/.github/workflows/ci_consumption_workflow.yml
+++ b/.github/workflows/ci_consumption_workflow.yml
@@ -1,7 +1,7 @@
 # This workflow will run all tests in tests/consumption_tests in Docker using a consumption image
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: CI Consumption tests
+name: CI Consumption E2E tests
 
 on:
   workflow_dispatch:
@@ -28,10 +28,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple -U -e .[dev]
-          python setup.py build
-          python setup.py webhost --branch-name=dev
-          python setup.py extension
+          python -m pip install -U -e .[dev]
       - name: Running 3.7 Tests
         if: matrix.python-version == 3.7
         env:
diff --git a/.github/workflows/ci_docker_con_workflow.yml b/.github/workflows/ci_docker_con_workflow.yml
index b4ea128ff..8a0dff868 100644
--- a/.github/workflows/ci_docker_con_workflow.yml
+++ b/.github/workflows/ci_docker_con_workflow.yml
@@ -29,10 +29,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple -U -e .[dev]
-          python setup.py build
-          python setup.py webhost --branch-name=dev
-          python setup.py extension
+          python -m pip install -U -e .[dev]
       - name: Running 3.7 Tests
         if: matrix.python-version == 3.7
         env:
diff --git a/.github/workflows/ci_docker_ded_workflow.yml b/.github/workflows/ci_docker_ded_workflow.yml
index 5bcdb6aa7..9de65a875 100644
--- a/.github/workflows/ci_docker_ded_workflow.yml
+++ b/.github/workflows/ci_docker_ded_workflow.yml
@@ -30,10 +30,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple -U -e .[dev]
-          python setup.py build
-          python setup.py webhost --branch-name=dev
-          python setup.py extension
+          python -m pip install -U -e .[dev]
       - name: Running 3.7 Tests
         if: matrix.python-version == 3.7
         env:
diff --git a/tests/utils/constants.py b/tests/utils/constants.py
index 12b7047fc..5f6eacd59 100644
--- a/tests/utils/constants.py
+++ b/tests/utils/constants.py
@@ -16,5 +16,5 @@
 PYAZURE_WEBHOST_DEBUG = "PYAZURE_WEBHOST_DEBUG"
 
 # CI test constants
-CONSUMPTION_DOCKER_TEST = "false"
-DEDICATED_DOCKER_TEST = "false"
+CONSUMPTION_DOCKER_TEST = "CONSUMPTION_DOCKER_TEST"
+DEDICATED_DOCKER_TEST = "DEDICATED_DOCKER_TEST"
diff --git a/tests/utils/testutils.py b/tests/utils/testutils.py
index 892c132bf..0df17e2d8 100644
--- a/tests/utils/testutils.py
+++ b/tests/utils/testutils.py
@@ -219,13 +219,13 @@ def setUpClass(cls):
         else:
             cls.host_stdout = tempfile.NamedTemporaryFile('w+t')
 
-        _setup_func_app(TESTS_ROOT / script_dir)
         try:
             if is_envvar_true(CONSUMPTION_DOCKER_TEST):
                 cls.webhost = WebHostConsumption(script_dir).spawn_container()
             elif is_envvar_true(DEDICATED_DOCKER_TEST):
                 cls.webhost = WebHostDedicated(script_dir).spawn_container()
             else:
+                _setup_func_app(TESTS_ROOT / script_dir)
                 cls.webhost = start_webhost(script_dir=script_dir,
                                             stdout=cls.host_stdout)
         except Exception: