diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py
index 428b44f0cec0df7837a8da9887d48f5fe057f01d..cf78e3fdf8d55daecffb4a7c55ca83462a24ccbb 100644
--- a/testsuite/driver/testglobals.py
+++ b/testsuite/driver/testglobals.py
@@ -403,7 +403,7 @@ class TestOptions:
        self.c_src      = False
        self.cxx_src    = False
        self.objc_src   = False
-       self.objcpp_src = False
+       self.objcxx_src = False
 
        # Does this test use a .cmm file?
        self.cmm_src    = False
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 62bad2ad1668f3b1d5be326908a0dba6827f3263..fc81f169aafe7d7a10d9908c9d574ee3ba97adcc 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -967,8 +967,8 @@ def cxx_src( name, opts ):
 def objc_src( name, opts ):
     opts.objc_src = True
 
-def objcpp_src( name, opts ):
-    opts.objcpp_src = True
+def objcxx_src( name, opts ):
+    opts.objcxx_src = True
 
 def cmm_src( name, opts ):
     opts.cmm_src = True
@@ -1961,7 +1961,7 @@ async def simple_build(name: Union[TestName, str],
     if (getTestOpts().c_src or
         getTestOpts().cxx_src or
         getTestOpts().objc_src or
-        getTestOpts().objcpp_src):
+        getTestOpts().objcxx_src):
         extra_hc_opts += ' -no-hs-main '
 
     if getTestOpts().compile_cmd_prefix == '':
@@ -2938,7 +2938,7 @@ def add_hs_lhs_suffix(name: str) -> Path:
         return add_suffix(name, 'cpp')
     elif getTestOpts().objc_src:
         return add_suffix(name, 'm')
-    elif getTestOpts().objcpp_src:
+    elif getTestOpts().objcxx_src:
         return add_suffix(name, 'mm')
     elif getTestOpts().literate:
         return add_suffix(name, 'lhs')
diff --git a/testsuite/tests/driver/objc/all.T b/testsuite/tests/driver/objc/all.T
index 1d5d134173e76de5b033c3a235ec4079f6bd3181..17342487ae941be655d994226c0ad72f8c5c12ac 100644
--- a/testsuite/tests/driver/objc/all.T
+++ b/testsuite/tests/driver/objc/all.T
@@ -12,8 +12,8 @@ test('objc-hi',
        expect_fail_for(['ghci']) ],
      compile_and_run, ['-framework Foundation'])
 
-test('objcpp-hi',
+test('objcxx-hi',
      [ skip_if_not_osx,
-       objcpp_src,
+       objcxx_src,
        expect_fail_for(['ghci']) ],
      compile_and_run, ['-framework Foundation -lc++'])
diff --git a/testsuite/tests/driver/objc/objcpp-hi.mm b/testsuite/tests/driver/objc/objcxx-hi.mm
similarity index 100%
rename from testsuite/tests/driver/objc/objcpp-hi.mm
rename to testsuite/tests/driver/objc/objcxx-hi.mm
diff --git a/testsuite/tests/driver/objc/objcpp-hi.stdout b/testsuite/tests/driver/objc/objcxx-hi.stdout
similarity index 100%
rename from testsuite/tests/driver/objc/objcpp-hi.stdout
rename to testsuite/tests/driver/objc/objcxx-hi.stdout