diff --git a/include/test/a11y/accessibletestbase.hxx b/include/test/a11y/accessibletestbase.hxx
index 187a345f64e0..4f01681e7e46 100644
--- a/include/test/a11y/accessibletestbase.hxx
+++ b/include/test/a11y/accessibletestbase.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/uno/Reference.hxx>
+#include <comphelper/OAccessible.hxx>
 
 #include <vcl/ITiledRenderable.hxx>
 #include <vcl/window.hxx>
@@ -51,8 +52,7 @@ protected:
     virtual void load(const rtl::OUString& sURL);
     virtual void loadFromSrc(const rtl::OUString& sSrcPath);
     void close();
-    css::uno::Reference<css::accessibility::XAccessible> getWindowAccessible();
-    css::uno::Reference<css::accessibility::XAccessibleContext> getWindowAccessibleContext();
+    rtl::Reference<comphelper::OAccessible> getWindowAccessible();
     virtual css::uno::Reference<css::accessibility::XAccessibleContext>
     getDocumentAccessibleContext();
 
@@ -146,7 +146,8 @@ protected:
     template <typename... Ts> bool activateMenuItem(Ts... names)
     {
         auto menuBar = AccessibilityTools::getAccessibleObjectForRole(
-            getWindowAccessibleContext(), css::accessibility::AccessibleRole::MENU_BAR);
+            css::uno::Reference<css::accessibility::XAccessibleContext>(getWindowAccessible()),
+            css::accessibility::AccessibleRole::MENU_BAR);
         CPPUNIT_ASSERT(menuBar.is());
         return activateMenuItem(menuBar, names...);
     }
diff --git a/sw/CppunitTest_sw_a11y.mk b/sw/CppunitTest_sw_a11y.mk
index 9ad6e4bcb6ac..38a801229522 100644
--- a/sw/CppunitTest_sw_a11y.mk
+++ b/sw/CppunitTest_sw_a11y.mk
@@ -18,7 +18,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_a11y, \
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_a11y, \
 	sal \
+	comphelper \
 	cppu \
+	cppuhelper \
 	cui \
 	subsequenttest \
 	test \
diff --git a/test/CppunitTest_test_a11y.mk b/test/CppunitTest_test_a11y.mk
index 8c12e4c00959..64daf10ede4e 100644
--- a/test/CppunitTest_test_a11y.mk
+++ b/test/CppunitTest_test_a11y.mk
@@ -15,7 +15,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,test_a11y, \
 
 $(eval $(call gb_CppunitTest_use_libraries,test_a11y, \
 	sal \
+	comphelper \
 	cppu \
+	cppuhelper \
 	subsequenttest \
 	test \
 ))
diff --git a/test/source/a11y/accessibletestbase.cxx b/test/source/a11y/accessibletestbase.cxx
index ce9cb3a2d517..2e5d670f16ae 100644
--- a/test/source/a11y/accessibletestbase.cxx
+++ b/test/source/a11y/accessibletestbase.cxx
@@ -81,22 +81,11 @@ void test::AccessibleTestBase::loadFromSrc(const rtl::OUString& sSrcPath)
     load(m_directories.getURLFromSrc(sSrcPath));
 }
 
-uno::Reference<accessibility::XAccessible> test::AccessibleTestBase::getWindowAccessible()
+rtl::Reference<comphelper::OAccessible> test::AccessibleTestBase::getWindowAccessible()
 {
     vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow);
     assert(pWindow);
-    css::uno::Reference<css::accessibility::XAccessible> xAccessible = pWindow->GetAccessible();
-
-    return xAccessible;
-}
-
-uno::Reference<accessibility::XAccessibleContext>
-test::AccessibleTestBase::getWindowAccessibleContext()
-{
-    css::uno::Reference<css::accessibility::XAccessible> xAccessible = getWindowAccessible();
-    assert(xAccessible.is());
-
-    return xAccessible->getAccessibleContext();
+    return pWindow->GetAccessible();
 }
 
 bool test::AccessibleTestBase::isDocumentRole(const sal_Int16 role)
diff --git a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
index 56a929e83d34..e87e2b84f526 100644
--- a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
+++ b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
@@ -69,7 +69,7 @@ public:
 
 uno::Reference<accessibility::XAccessibleContext> AccessibleStatusBarTest::getTestObject()
 {
-    uno::Reference<accessibility::XAccessibleContext> xWinContext = getWindowAccessibleContext();
+    uno::Reference<accessibility::XAccessibleContext> xWinContext = getWindowAccessible();
     std::cout << "got accessible: " << xWinContext << std::endl;
     std::cout << "accessible name: " << AccessibilityTools::debugString(xWinContext) << std::endl;
 
diff --git a/vcl/CppunitTest_vcl_gtk3_a11y.mk b/vcl/CppunitTest_vcl_gtk3_a11y.mk
index dbfefbf1cc59..90260acda7bf 100644
--- a/vcl/CppunitTest_vcl_gtk3_a11y.mk
+++ b/vcl/CppunitTest_vcl_gtk3_a11y.mk
@@ -38,7 +38,9 @@ $(eval $(call gb_CppunitTest_add_libs,vcl_gtk3_a11y,\
 
 $(eval $(call gb_CppunitTest_use_libraries,vcl_gtk3_a11y, \
 	sal \
+	comphelper \
 	cppu \
+	cppuhelper \
 	subsequenttest \
 	test \
 	i18nlangtag \
diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index b510d3243067..13cb6e6b1318 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -477,10 +477,10 @@ CPPUNIT_TEST_FIXTURE(Atspi2TestTree, Test1)
                                       accessibility::AccessibleRelationType_CONTENT_FLOWS_TO));
     // END HACK
 
-    auto xContext = getWindowAccessibleContext();
-    CPPUNIT_ASSERT(xContext.is());
+    rtl::Reference<comphelper::OAccessible> pAccessible = getWindowAccessible();
+    CPPUNIT_ASSERT(pAccessible.is());
 
-    //~ dumpA11YTree(xContext);
+    //~ dumpA11YTree(pAccessible);
 
     // get the window manager frame
     auto xAtspiWindow = getDescendentAtPath(m_pAtspiApp, 0, ATSPI_ROLE_FRAME);