diff --git a/.github/.terraformrc b/.github/.terraformrc
new file mode 100644
index 00000000..ace9fb3b
--- /dev/null
+++ b/.github/.terraformrc
@@ -0,0 +1 @@
+plugin_cache_dir   = "$HOME/.terraform.d/plugin-cache"
\ No newline at end of file
diff --git a/.github/workflows/fabric-linting.yml b/.github/workflows/linting.yml
similarity index 92%
rename from .github/workflows/fabric-linting.yml
rename to .github/workflows/linting.yml
index 6b3dd2c4..ce0e3b89 100644
--- a/.github/workflows/fabric-linting.yml
+++ b/.github/workflows/linting.yml
@@ -17,8 +17,12 @@ on:
   pull_request:
     branches:
       - master
+tags:
+  - ci
+  - lint
 env:
     _TERRAFORM_VERSION: 1.0.4
+    TF_CLI_CONFIG_FILE: $GITHUB_WORKSPACE/.github/.terraformrc
 jobs:
   linting:
     runs-on: ubuntu-latest
@@ -52,4 +56,4 @@ jobs:
       - name: Check documentation
         id: documentation
         run: |
-          python3 tools/check_documentation.py cloud-operations/ data-solutions/ data-solutions/data-platform-foundations/ factories/ foundations/ modules/ networking/
\ No newline at end of file
+          python3 tools/check_documentation.py cloud-operations/ data-solutions/ data-solutions/data-platform-foundations/ factories/ factories/firewall-vpc-rules/ foundations/ modules/ networking/
\ No newline at end of file
diff --git a/.github/workflows/tests-environment.yml b/.github/workflows/tests-environment.yml
new file mode 100644
index 00000000..e88fce8d
--- /dev/null
+++ b/.github/workflows/tests-environment.yml
@@ -0,0 +1,49 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: 'Tests Environment'
+on: 
+  pull_request:
+    branches:
+      - master
+tags:
+  - ci
+  - test
+env:
+    _TERRAFORM_VERSION: 1.0.4
+    TF_CLI_CONFIG_FILE: $GITHUB_WORKSPACE/.github/.terraformrc
+jobs:
+  tests-environment:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --user --no-warn-script-location -r tests/requirements.txt &&
+          wget https://releases.hashicorp.com/terraform/${_TERRAFORM_VERSION}/terraform_${_TERRAFORM_VERSION}_linux_amd64.zip &&
+          unzip terraform_${_TERRAFORM_VERSION}_linux_amd64.zip -d $HOME/.local/bin &&
+          rm terraform_${_TERRAFORM_VERSION}_linux_amd64.zip &&
+          chmod 755 $HOME/.local/bin/terraform &&
+          mkdir -p $HOME/.terraform.d/plugin-cache
+
+      - name: Boilterplate
+        id: test-environments
+        run: |
+          pytest -vv tests/cloud_operations tests/data_solutions tests/factories tests/foundations tests/networking
\ No newline at end of file