diff --git a/src/rocshmem.cpp b/src/rocshmem.cpp
index 93b331b4d2..5b2a595cc4 100644
--- a/src/rocshmem.cpp
+++ b/src/rocshmem.cpp
@@ -229,7 +229,8 @@ __host__ int rocshmem_team_split_strided(
   auto num_user_teams{backend->team_tracker.get_num_user_teams()};
   auto max_num_teams{backend->team_tracker.get_max_num_teams()};
   if (num_user_teams >= max_num_teams - 1) {
-    abort();
+    /* Exceeded maximum number of teams */
+    return -1;
   }
 
   if (parent_team == ROCSHMEM_TEAM_INVALID) {
diff --git a/tests/functional_tests/tester.cpp b/tests/functional_tests/tester.cpp
index fd7d0e30f6..6582e2bbb6 100644
--- a/tests/functional_tests/tester.cpp
+++ b/tests/functional_tests/tester.cpp
@@ -570,7 +570,7 @@ bool Tester::peLaunchesKernel() {
    * Some test types are active on both sides.
    */
   is_launcher = is_launcher || (_type == TeamReductionTestType) ||
-                (_type == TeamBroadcastTestType) ||
+                (_type == TeamBroadcastTestType) || (_type == TeamCtxInfraTestType) ||
                 (_type == AllToAllTestType) || (_type == FCollectTestType) ||
                 (_type == PingPongTestType) || (_type == BarrierAllTestType) ||
                 (_type == SyncTestType) || (_type == SyncAllTestType) ||