diff --git a/toolkit/qa/cppunit/a11y/XAccessibleEventBroadcasterTester.hxx b/include/test/a11y/XAccessibleEventBroadcasterTester.hxx
similarity index 95%
rename from toolkit/qa/cppunit/a11y/XAccessibleEventBroadcasterTester.hxx
rename to include/test/a11y/XAccessibleEventBroadcasterTester.hxx
index 5642d10005c2..2680f9a22e2c 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleEventBroadcasterTester.hxx
+++ b/include/test/a11y/XAccessibleEventBroadcasterTester.hxx
@@ -19,12 +19,14 @@
 
 #pragma once
 
+#include <test/testdllapi.hxx>
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 
-class XAccessibleEventBroadcasterTester
+class OOO_DLLPUBLIC_TEST XAccessibleEventBroadcasterTester
 {
 private:
     const css::uno::Reference<css::accessibility::XAccessibleEventBroadcaster> mxBroadcaster;
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx b/include/test/a11y/XAccessibleExtendedComponentTester.hxx
similarity index 94%
rename from toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx
rename to include/test/a11y/XAccessibleExtendedComponentTester.hxx
index 353fd663b1a9..2f252dd935db 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx
+++ b/include/test/a11y/XAccessibleExtendedComponentTester.hxx
@@ -19,10 +19,12 @@
 
 #pragma once
 
+#include <test/testdllapi.hxx>
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
 
-class XAccessibleExtendedComponentTester
+class OOO_DLLPUBLIC_TEST XAccessibleExtendedComponentTester
 {
 protected:
     const css::uno::Reference<css::accessibility::XAccessibleExtendedComponent> mxExtendedComponent;
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index d5294bf2f4de..a0db2a2ef7ca 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -49,6 +49,8 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
 	test/source/a11y/AccessibilityTools \
 	test/source/a11y/XAccessibleComponentTester \
 	test/source/a11y/XAccessibleContextTester \
+	test/source/a11y/XAccessibleEventBroadcasterTester \
+	test/source/a11y/XAccessibleExtendedComponentTester \
 	test/source/a11y/accessibletestbase \
 	test/source/a11y/eventposter \
 	test/source/beans/xpropertyset \
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleEventBroadcasterTester.cxx b/test/source/a11y/XAccessibleEventBroadcasterTester.cxx
similarity index 99%
rename from toolkit/qa/cppunit/a11y/XAccessibleEventBroadcasterTester.cxx
rename to test/source/a11y/XAccessibleEventBroadcasterTester.cxx
index cdf4ccbcf592..7c4ff56127b3 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleEventBroadcasterTester.cxx
+++ b/test/source/a11y/XAccessibleEventBroadcasterTester.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "XAccessibleEventBroadcasterTester.hxx"
-
 #include <iostream>
 
 #include <cppunit/TestAssert.h>
@@ -39,6 +37,7 @@
 #include <sal/log.hxx>
 
 #include <test/a11y/AccessibilityTools.hxx>
+#include <test/a11y/XAccessibleEventBroadcasterTester.hxx>
 
 using namespace css;
 
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx b/test/source/a11y/XAccessibleExtendedComponentTester.cxx
similarity index 96%
rename from toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx
rename to test/source/a11y/XAccessibleExtendedComponentTester.cxx
index ec192bdf0f47..0fa078c31479 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx
+++ b/test/source/a11y/XAccessibleExtendedComponentTester.cxx
@@ -17,11 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "XAccessibleExtendedComponentTester.hxx"
-
 #include <iostream>
 
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
+#include <test/a11y/XAccessibleExtendedComponentTester.hxx>
 
 /**
  * @brief Just calls the method.
diff --git a/toolkit/CppunitTest_toolkit_a11y.mk b/toolkit/CppunitTest_toolkit_a11y.mk
index 2fe929a31591..65103b42bdca 100644
--- a/toolkit/CppunitTest_toolkit_a11y.mk
+++ b/toolkit/CppunitTest_toolkit_a11y.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,toolkit_a11y))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,toolkit_a11y, \
 	toolkit/qa/cppunit/a11y/AccessibleStatusBarTest \
-	toolkit/qa/cppunit/a11y/XAccessibleEventBroadcasterTester \
-	toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,toolkit_a11y, \
diff --git a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
index ce088f53d7d1..ae7a16536d45 100644
--- a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
+++ b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
@@ -36,8 +36,8 @@
 #include <test/a11y/AccessibilityTools.hxx>
 #include <test/a11y/XAccessibleComponentTester.hxx>
 #include <test/a11y/XAccessibleContextTester.hxx>
-#include "XAccessibleExtendedComponentTester.hxx"
-#include "XAccessibleEventBroadcasterTester.hxx"
+#include <test/a11y/XAccessibleExtendedComponentTester.hxx>
+#include <test/a11y/XAccessibleEventBroadcasterTester.hxx>
 
 using namespace css;