diff --git a/conf/github_repos.yaml.template b/conf/github_repos.yaml.template
new file mode 100644
index 00000000000..699fd45f2a3
--- /dev/null
+++ b/conf/github_repos.yaml.template
@@ -0,0 +1,16 @@
+GITHUB_REPOS:
+  BASE_MARKER:
+  FOREMAN:
+    ORG: theforeman
+    REPO: foreman
+    RULES:
+     - PATH:
+       MARKER:
+       MARKER_ARG:
+  KATELLO:
+    ORG: Katello
+    REPO: katello
+    RULES:
+      - PATH:
+        MARKER:
+        MARKER_ARG:
diff --git a/conftest.py b/conftest.py
index f50f81e2975..4f2b6745bfd 100644
--- a/conftest.py
+++ b/conftest.py
@@ -23,6 +23,7 @@
     'pytest_plugins.sanity_plugin',
     'pytest_plugins.video_cleanup',
     'pytest_plugins.capsule_n-minus',
+    'pytest_plugins.upstream_pr',
     # Fixtures
     'pytest_fixtures.core.broker',
     'pytest_fixtures.core.sat_cap_factory',
diff --git a/pytest_plugins/upstream_pr.py b/pytest_plugins/upstream_pr.py
new file mode 100644
index 00000000000..4313cd69026
--- /dev/null
+++ b/pytest_plugins/upstream_pr.py
@@ -0,0 +1,94 @@
+from github import Github
+
+from robottelo.config import settings
+from robottelo.logging import collection_logger as logger
+
+
+def rule_match(item, rules):
+    """Return True if `item` has a marker matching one of the `rules`.
+
+    In order for a rule to match:
+    1. If `settings.github_repos.base_marker` exists, then `item` has a marker with the given value
+    as its `name` attribute.
+    2. `item` has a marker with the name given in `rule.marker`.
+    3. If `rule.marker_arg` exists, then the item's marker must also have the given value in marker's
+    `args` attribute.
+    """
+    base_marker = settings.github_repos.get('base_marker')
+    return (
+        not base_marker or any(base_marker == marker.name for marker in item.iter_markers())
+    ) and any(
+        rule.marker == marker.name
+        and (not rule.get('marker_arg') or rule.get('marker_arg') in marker.args)
+        for marker in item.iter_markers()
+        for rule in rules
+    )
+
+
+def pytest_addoption(parser):
+    """Add CLI option to specify upstream GitHub PRs.
+
+    Add --upstream-pr option for filtering tests based on the files modified by upstream
+    PRs.
+    """
+    parser.addoption(
+        "--upstream-pr",
+        help=(
+            "Comma separated list of upstream PRs to filter test collection based on files modified in upstream.\n"
+            "Usage: `pytest tests/foreman --upstream-pr foreman/10146`"
+        ),
+    )
+
+
+def pytest_collection_modifyitems(session, items, config):
+    """Filter tests based on upstream PRs.
+    1. Get the list of modified files in the upstream PRs.
+    2. Map each file to at most one marker.
+    3. Filter the collected tests to include only those with matching markers.
+
+    Note:
+    If no rules were matched above, all tests will be deselected. Any unprocessed filenames
+    (not matching any rules) are ignored.
+
+    """
+    upstream_prs = [
+        pr_info for pr_info in (config.getoption('upstream_pr') or '').split(',') if pr_info != ''
+    ]
+    if not upstream_prs:
+        return
+
+    matched_rules = []
+    for pr_info in upstream_prs:
+        # Get all filenames modified by this PR
+        repo_key, pr_id = pr_info.split('/')
+        if not (repo_config := settings.github_repos.get(repo_key)):
+            raise Exception(f"Key {repo_key} not found in settings file.")
+        pr = Github().get_repo(f"{repo_config.org}/{repo_config.repo}").get_pull(int(pr_id))
+        pr_filenames = {file.filename for commit in pr.get_commits() for file in commit.files}
+
+        # Get a list of matching rules
+        unprocessed_filenames = pr_filenames.copy()
+        for rule in repo_config.rules:
+            if matched_filenames := {
+                filename for filename in unprocessed_filenames if filename.startswith(rule.path)
+            }:
+                matched_rules.append(rule)
+                unprocessed_filenames.difference_update(matched_filenames)
+
+    # If no rules were matched above, deselect all tests.
+    # Any unprocessed filenames are ignored.
+    selected = []
+    deselected = []
+    for item in items:
+        if matched_rules:
+            if rule_match(item, matched_rules):
+                selected.append(item)
+            else:
+                logger.debug(f'Deselected test {item.nodeid} due to PR filter {upstream_prs}')
+                deselected.append(item)
+        else:
+            logger.debug(f'Deselected test {item.nodeid} due to PR filter {upstream_prs}')
+            deselected.append(item)
+
+    config.hook.pytest_deselected(items=deselected)
+    items[:] = selected
diff --git a/requirements.txt b/requirements.txt
index 9cb4b6d15fd..233982a61ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,6 +11,7 @@ jinja2==3.1.4
 manifester==0.0.14
 navmazing==1.2.2
 productmd==1.38
+PyGithub==2.3.0
 pyotp==2.9.0
 python-box==7.1.1
 pytest==8.2.0
diff --git a/robottelo/config/validators.py b/robottelo/config/validators.py
index a47dba2e211..4504037d9b9 100644
--- a/robottelo/config/validators.py
+++ b/robottelo/config/validators.py
@@ -164,6 +164,15 @@
             must_exist=True,
         ),
     ],
+    github_repos=[
+        Validator('github_repos.base_marker', default=None),
+        Validator('github_repos.foreman.org', default='theforeman'),
+        Validator('github_repos.foreman.repo', default='foreman'),
+        Validator('github_repos.foreman.rules', default=[], is_type_of=list),
+        Validator('github_repos.katello.org', default='Katello'),
+        Validator('github_repos.katello.repo', default='katello'),
+        Validator('github_repos.katello.rules', default=[], is_type_of=list),
+    ],
     http_proxy=[
         Validator(
             'http_proxy.un_auth_proxy_url',