diff --git a/galaxy_ng/tests/integration/api/test_auth.py b/galaxy_ng/tests/integration/api/test_auth.py
index 012ff85052..1377b0690e 100644
--- a/galaxy_ng/tests/integration/api/test_auth.py
+++ b/galaxy_ng/tests/integration/api/test_auth.py
@@ -76,7 +76,7 @@ def test_gateway_auth_admin_gateway_sessionid(galaxy_client):
     remove_from_cache("admin")
     with pytest.raises(GalaxyClientError) as ctx:
         gc.get("v3/plugin/ansible/content/published/collections/index/", relogin=False)
-    assert ctx.value.response.status_code == 403
+    assert ctx.value.response.status_code == 401
     remove_from_cache("admin")
 
 
@@ -94,7 +94,7 @@ def test_gateway_auth_admin_gateway_csrftoken(galaxy_client):
     remove_from_cache("admin")
     with pytest.raises(GalaxyClientError) as ctx:
         gc.get("v3/plugin/ansible/content/published/collections/index/", relogin=False)
-    assert ctx.value.response.status_code == 403
+    assert ctx.value.response.status_code == 401
     remove_from_cache("admin")
 
 
@@ -112,7 +112,7 @@ def test_gateway_token_auth(galaxy_client):
 
     with pytest.raises(GalaxyClientError) as ctx:
         gc.get("v3/plugin/ansible/content/published/collections/index/", relogin=False)
-    assert ctx.value.response.status_code == 403
+    assert ctx.value.response.status_code == 401
 
 
 @pytest.mark.deployment_standalone
diff --git a/galaxy_ng/tests/integration/api/test_dab.py b/galaxy_ng/tests/integration/api/test_dab.py
index e606893dca..794d53056f 100644
--- a/galaxy_ng/tests/integration/api/test_dab.py
+++ b/galaxy_ng/tests/integration/api/test_dab.py
@@ -3,13 +3,16 @@
 
 from ansible.galaxy.api import GalaxyError
 
+from ..utils.iqe_utils import is_dev_env_standalone
+
 
 @pytest.mark.min_hub_version("4.10dev")
 @pytest.mark.all
 @pytest.mark.deployment_community
 @pytest.mark.skip_in_gw
 def test_dab_service_index_is_not_available(ansible_config):
-
+    if not is_dev_env_standalone():
+        pytest.skip("This test should only run if hub is deployed without gateway")
     config = ansible_config("admin")
     api_prefix = config.get("api_prefix").rstrip("/")
     api_client = get_client(config, request_token=True, require_auth=True)
diff --git a/galaxy_ng/tests/integration/api/test_ui_namespace_owners.py b/galaxy_ng/tests/integration/api/test_ui_namespace_owners.py
index aa831f769f..672a8a8488 100644
--- a/galaxy_ng/tests/integration/api/test_ui_namespace_owners.py
+++ b/galaxy_ng/tests/integration/api/test_ui_namespace_owners.py
@@ -14,12 +14,14 @@
 @pytest.mark.deployment_standalone
 @pytest.mark.api_ui
 @pytest.mark.min_hub_version("4.9dev")
+@pytest.mark.skip_in_gw
 def test_api_ui_v1_namespace_owners_users_and_group_separation(ansible_config):
 
     # https://issues.redhat.com/browse/AAH-3121
     # Namespace owners should have a list of users that are directly added as owners.
     # That list of users should -not- include users of groups that have been
     # added as owners.
+    # TODO: make this test compatible with GW
 
     cfg = ansible_config('partner_engineer')
     with UIClient(config=cfg) as uclient:
diff --git a/galaxy_ng/tests/integration/cli/test_cli_flow.py b/galaxy_ng/tests/integration/cli/test_cli_flow.py
index e5c94dc10f..701e775357 100644
--- a/galaxy_ng/tests/integration/cli/test_cli_flow.py
+++ b/galaxy_ng/tests/integration/cli/test_cli_flow.py
@@ -108,7 +108,7 @@ def test_publish_and_install_by_self(galaxy_client, published, cleanup_collectio
 @pytest.mark.cli
 @pytest.mark.deployment_cloud
 def test_publish_and_expect_uncertified_hidden(
-    ansible_config,
+    galaxy_client,
     published,
     cleanup_collections,
     settings,
@@ -120,9 +120,9 @@ def test_publish_and_expect_uncertified_hidden(
     ansible_galaxy(
         f"collection install {published.namespace}.{published.name}",
         check_retcode=0,
-        ansible_config=ansible_config("basic_user"),
+        galaxy_client=galaxy_client("basic_user"),
     )
     ansible_galaxy(
         f"collection install {published.namespace}.{published.name}:1.0.0",
-        ansible_config=ansible_config("basic_user"),
+        galaxy_client=galaxy_client("basic_user"),
     )