diff --git a/Testing/PyQt/CMakeLists.txt b/Testing/Code/Wrappers/PyQt/PyQt/CMakeLists.txt
similarity index 100%
rename from Testing/PyQt/CMakeLists.txt
rename to Testing/Code/Wrappers/PyQt/PyQt/CMakeLists.txt
diff --git a/Testing/PyQt/PyQtTest.py b/Testing/Code/Wrappers/PyQt/PyQt/PyQtTest.py
similarity index 100%
rename from Testing/PyQt/PyQtTest.py
rename to Testing/Code/Wrappers/PyQt/PyQt/PyQtTest.py
diff --git a/Testing/QtWidget/CMakeLists.txt b/Testing/Code/Wrappers/Qt/QtWidget/CMakeLists.txt
similarity index 100%
rename from Testing/QtWidget/CMakeLists.txt
rename to Testing/Code/Wrappers/Qt/QtWidget/CMakeLists.txt
diff --git a/Testing/QtWidget/otbWrapperQtWidgetParameterFactory.cxx b/Testing/Code/Wrappers/Qt/QtWidget/otbWrapperQtWidgetParameterFactory.cxx
similarity index 100%
rename from Testing/QtWidget/otbWrapperQtWidgetParameterFactory.cxx
rename to Testing/Code/Wrappers/Qt/QtWidget/otbWrapperQtWidgetParameterFactory.cxx
diff --git a/Testing/QtWidget/otbWrapperQtWidgetTests.cxx b/Testing/Code/Wrappers/Qt/QtWidget/otbWrapperQtWidgetTests.cxx
similarity index 100%
rename from Testing/QtWidget/otbWrapperQtWidgetTests.cxx
rename to Testing/Code/Wrappers/Qt/QtWidget/otbWrapperQtWidgetTests.cxx