diff --git a/ros_buildfarm/ci_job.py b/ros_buildfarm/ci_job.py
index 21868f0b1..eef24e408 100644
--- a/ros_buildfarm/ci_job.py
+++ b/ros_buildfarm/ci_job.py
@@ -297,8 +297,7 @@ def _get_ci_job_config(
 
         # only Ubuntu Focal has a new enough pytest version which generates
         # JUnit compliant result files
-        'xunit_publisher_types': get_xunit_publisher_types_and_patterns(
-            ros_version, os_name == 'ubuntu' and os_code_name != 'bionic'),
+        'xunit_publisher_types': get_xunit_publisher_types_and_patterns(),
     }
     job_config = expand_template(template_name, job_data)
     return job_config
diff --git a/ros_buildfarm/common.py b/ros_buildfarm/common.py
index ca7e3855c..89f5d8aea 100644
--- a/ros_buildfarm/common.py
+++ b/ros_buildfarm/common.py
@@ -591,18 +591,7 @@ def get_package_repo_data(repository_baseurl, targets, cache_dir):
     return data
 
 
-def get_xunit_publisher_types_and_patterns(
-    ros_version, pytest_junit_compliant,
-):
+def get_xunit_publisher_types_and_patterns():
     types = []
-    if ros_version == 1:
-        types.append(('GoogleTestType', 'ws/test_results/**/*.xml'))
-    elif ros_version == 2:
-        types.append(('GoogleTestType', 'ws/test_results/**/*.gtest.xml'))
-        types.append((
-            'JUnitType' if pytest_junit_compliant else 'GoogleTestType',
-            'ws/test_results/**/pytest.xml'))
-        types.append(('JUnitType', 'ws/test_results/**/*.xunit.xml'))
-    else:
-        assert False, 'Unsupported ROS version: ' + str(ros_version)
+    types.append(('GoogleTestType', 'ws/test_results/**/*.xml'))
     return types
diff --git a/ros_buildfarm/devel_job.py b/ros_buildfarm/devel_job.py
index f6f5ab41e..c5a22d446 100644
--- a/ros_buildfarm/devel_job.py
+++ b/ros_buildfarm/devel_job.py
@@ -437,8 +437,7 @@ def _get_devel_job_config(
 
         # only Ubuntu Focal has a new enough pytest version which generates
         # JUnit compliant result files
-        'xunit_publisher_types': get_xunit_publisher_types_and_patterns(
-            ros_version, os_name == 'ubuntu' and os_code_name != 'bionic'),
+        'xunit_publisher_types': get_xunit_publisher_types_and_patterns(),
 
         'git_ssh_credential_id': config.git_ssh_credential_id,