diff --git a/.github/workflows/integration-informing.yaml b/.github/workflows/integration-informing.yaml
index d569a7c66..e56b4c1f6 100644
--- a/.github/workflows/integration-informing.yaml
+++ b/.github/workflows/integration-informing.yaml
@@ -90,7 +90,7 @@ jobs:
           TEST_FLAVOR: ${{ matrix.patch }}
           TEST_INSPECTION_REPORTS_DIR: ${{ github.workspace }}/inspection-reports
         run: |
-          cd tests/integration && sg lxd -c 'tox -e integration -- --tags pull_request'
+          cd tests/integration && sg lxd -c 'tox -e integration -- --tags up_to_weekly'
       - name: Prepare inspection reports
         if: failure()
         run: |
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 13857352e..d30eb4bb8 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -107,17 +107,7 @@ jobs:
           TEST_VERSION_UPGRADE_MIN_RELEASE: "1.31"
           TEST_MIRROR_LIST: '[{"name": "ghcr.io", "port": 5000, "remote": "https://ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}, {"name": "docker.io", "port": 5001, "remote": "https://registry-1.docker.io", "username": "", "password": ""}, {"name": "rocks.canonical.com", "port": 5002, "remote": "https://rocks.canonical.com/cdk"}]'
         run: |
-          tags="pull_request"
-          # Run all tests if there are test changes. In case of a PR, we'll
-          # get a merge commit that includes all changes.
-          if git diff HEAD HEAD~1 --name-only | grep "tests/"; then
-            tags="up_to_weekly"
-          fi
-          # Run all tests on backports.
-          if echo ${{ github.base_ref }} | grep "release-"; then
-            tags="up_to_weekly"
-          fi
-          cd tests/integration && sg lxd -c "tox -e integration -- --tags $tags"
+          cd tests/integration && sg lxd -c "tox -e integration -- --tags up_to_weekly"
       - name: Prepare inspection reports
         if: failure()
         run: |
diff --git a/.github/workflows/nightly-test.yaml b/.github/workflows/nightly-test.yaml
index 98089d932..f63cb253d 100644
--- a/.github/workflows/nightly-test.yaml
+++ b/.github/workflows/nightly-test.yaml
@@ -3,6 +3,7 @@ name: Nightly Latest/Edge Tests
 on:
   schedule:
     - cron: "0 0 * * *" # Runs every midnight
+  pull_request:
 
 permissions:
   contents: read
@@ -53,7 +54,7 @@ jobs:
           TEST_MIRROR_LIST: '[{"name": "ghcr.io", "port": 5000, "remote": "https://ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}, {"name": "docker.io", "port": 5001, "remote": "https://registry-1.docker.io", "username": "", "password": ""}, {"name": "rocks.canonical.com", "port": 5002, "remote": "https://rocks.canonical.com/cdk"}]'
         run: |
           export PATH="/home/runner/.local/bin:$PATH"
-          cd tests/integration && sg lxd -c 'tox -vve integration -- --tags up_to_nightly '
+          cd tests/integration && sg lxd -c 'tox -vve integration -- --tags up_to_weekly '
       - name: Prepare inspection reports
         if: failure()
         run: |