diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
index 917110a7..37c0e7f4 100644
--- a/.github/workflows/integration-testing.yml
+++ b/.github/workflows/integration-testing.yml
@@ -156,7 +156,7 @@ jobs:
           - group: payments
             path: tests_integ/payments
             timeout: 15
-            extra-deps: "strands-agents"
+            extra-deps: "strands-agents strands-agents-tools"
             ignore: ""
     steps:
       - name: Configure Credentials
diff --git a/tests_integ/payments/test_payment_client.py b/tests_integ/payments/test_payment_client.py
index eec12c53..e4cd3233 100644
--- a/tests_integ/payments/test_payment_client.py
+++ b/tests_integ/payments/test_payment_client.py
@@ -64,21 +64,14 @@ class TestPaymentClientControlPlane:
     def setup_class(cls):
         """Set up test environment."""
         cls.region = os.environ.get("BEDROCK_TEST_REGION", "us-west-2")
-        cls.role_arn = os.environ.get(
-            "TEST_PAYMENT_ROLE_ARN",
-            "arn:aws:iam::123456789012:role/bedrock-payment-role",
-        )
+        cls.role_arn = os.environ.get("RUNTIME_ROLE_ARN")
+        if not cls.role_arn:
+            pytest.skip("RUNTIME_ROLE_ARN must be set")
         cls.client = PaymentClient(region_name=cls.region)
-        # Use timestamp with microseconds for uniqueness
         cls.test_prefix = f"t{int(time.time() * 1000000)}"
         cls.created_managers = []
         cls.created_connectors = []
-        cls.role_arn = os.environ.get(
-            "TEST_PAYMENT_ROLE_ARN",
-            "arn:aws:iam::123456789012:role/bedrock-payment-role",
-        )
 
-    @classmethod
     @classmethod
     def teardown_class(cls):
         """Clean up test resources."""
@@ -285,10 +278,8 @@ def setup_class(cls):
         cls.api_key_secret = os.environ.get("PAYMENT_TEST_API_KEY_SECRET")
         cls.wallet_secret = os.environ.get("PAYMENT_TEST_WALLET_SECRET")
         cls.skip_tests = not (cls.api_key_secret and cls.wallet_secret)
-        cls.role_arn = os.environ.get(
-            "TEST_PAYMENT_ROLE_ARN",
-            "arn:aws:iam::123456789012:role/bedrock-payment-role",
-        )
+        cls.role_arn = os.environ.get("RUNTIME_ROLE_ARN")
+        cls.skip_tests = cls.skip_tests or not cls.role_arn
 
     @classmethod
     def teardown_class(cls):