diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7494866c5cd..8eff92fe403 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -2129,7 +2129,7 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }})\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                    "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }}): `${{ steps.get-workflow-info.outputs.conclusion }}`\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
                   }
                 }
               ]
diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja
index 391ffc6170a..ae77bdda713 100644
--- a/.github/workflows/templates/nightly.yml.jinja
+++ b/.github/workflows/templates/nightly.yml.jinja
@@ -133,7 +133,7 @@ concurrency:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }})\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                    "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }}): `${{ steps.get-workflow-info.outputs.conclusion }}`\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
                   }
                 }
               ]
diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index 293a43603e9..0bcf2252227 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -44,7 +44,7 @@ def grains(sminion):
     return sminion.opts["grains"].copy()
 
 
-@pytest.fixture(scope="module", autouse=True)
+@pytest.fixture(scope="session", autouse=True)
 def _system_up_to_date(
     grains,
     shell,
diff --git a/pkg/tests/integration/test_pkg.py b/pkg/tests/integration/test_pkg.py
index ef220b124b6..5aedefa6ef1 100644
--- a/pkg/tests/integration/test_pkg.py
+++ b/pkg/tests/integration/test_pkg.py
@@ -3,13 +3,6 @@ import sys
 import pytest
 
 
-@pytest.fixture(scope="module")
-def grains(salt_call_cli):
-    ret = salt_call_cli.run("--local", "grains.items")
-    assert ret.data, ret
-    return ret.data
-
-
 @pytest.fixture(scope="module")
 def pkg_name(salt_call_cli, grains):
     if sys.platform.startswith("win"):