diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeLists.txt
index 7af4f5e9f0b21d955dacd38faf33d802f9e2c4a4..1b91473e9078950098f0d3aa95217cd58b1a55a7 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -38,7 +38,9 @@ if(BUILD_TESTING)
     add_subdirectory(adblock/common/autotests)
     add_subdirectory(viewerplugins/tests/)
     add_subdirectory(htmlwriter/autotests/)
-
+    if (QTWEBENGINE_SUPPORT_OPTION)
+       add_subdirectory(viewer/webengine/tests)
+    endif()
 endif()
 add_subdirectory(pics)
 add_subdirectory(kconf_update)
diff --git a/messageviewer/src/viewer/webengine/tests/CMakeLists.txt b/messageviewer/src/viewer/webengine/tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b006b7731064d8bb2bd89b09142f9db6d290667c
--- /dev/null
+++ b/messageviewer/src/viewer/webengine/tests/CMakeLists.txt
@@ -0,0 +1,33 @@
+if (NOT MESSAGEVIEWER_USE_QTWEBENGINE)
+set(webengineaccesskey_test_SRCS
+    testwebengineaccesskey.cpp
+    )
+
+add_executable(webengineaccesskeytest ${webengineaccesskey_test_SRCS})
+
+target_link_libraries(webengineaccesskeytest
+    Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes KF5::WebKit Qt5::WebKitWidgets
+    )
+endif()
+####
+
+set(scrolladdattachment_test_SRCS
+    testwebenginescrolladdattachment.cpp
+    )
+
+add_executable(scrolladdattachmenttest ${scrolladdattachment_test_SRCS})
+
+target_link_libraries(scrolladdattachmenttest
+    Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes KF5::MessageViewer
+    )
+
+####
+set(testmailwebengine_test_SRCS
+    testmailwebengine.cpp
+    )
+
+add_executable(testmailwebengine ${testmailwebengine_test_SRCS})
+
+target_link_libraries(testmailwebengine
+    Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes KF5::MessageViewer
+    )
diff --git a/webengineviewer/src/tests/testmailwebengine.cpp b/messageviewer/src/viewer/webengine/tests/testmailwebengine.cpp
similarity index 94%
rename from webengineviewer/src/tests/testmailwebengine.cpp
rename to messageviewer/src/viewer/webengine/tests/testmailwebengine.cpp
index 96377afc189f2ad4d289abfb499c6aa7bec9f227..dd5d49eff6723d033f2d1b1c150a92d23fcf62ae 100644
--- a/webengineviewer/src/tests/testmailwebengine.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testmailwebengine.cpp
@@ -23,13 +23,13 @@
 #include <QVBoxLayout>
 #include <QWebEngineSettings>
 
-#include <webengineviewer/mailwebengineview.h>
+#include <MessageViewer/MailWebEngineView>
 
 TestMailWebEngine::TestMailWebEngine(QWidget *parent)
     : QWidget(parent)
 {
     QVBoxLayout *vbox = new QVBoxLayout(this);
-    mTestWebEngine = new WebEngineViewer::MailWebEngineView(new KActionCollection(this), this);
+    mTestWebEngine = new MessageViewer::MailWebEngineView(new KActionCollection(this), this);
     mTestWebEngine->load(QUrl(QStringLiteral("http://www.kde.org")));
     mTestWebEngine->settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, true);
     vbox->addWidget(mTestWebEngine);
diff --git a/webengineviewer/src/tests/testmailwebengine.h b/messageviewer/src/viewer/webengine/tests/testmailwebengine.h
similarity index 92%
rename from webengineviewer/src/tests/testmailwebengine.h
rename to messageviewer/src/viewer/webengine/tests/testmailwebengine.h
index 73f76966c36d745224cea3bca56d51abf3c79255..06a3fc5f1bafd81ff32f9b50a892b8c9c75fdb4c 100644
--- a/webengineviewer/src/tests/testmailwebengine.h
+++ b/messageviewer/src/viewer/webengine/tests/testmailwebengine.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 
-namespace WebEngineViewer
+namespace MessageViewer
 {
 class MailWebEngineView;
 }
@@ -36,7 +36,7 @@ private Q_SLOTS:
 
     void slotScrollDown();
 private:
-    WebEngineViewer::MailWebEngineView *mTestWebEngine;
+    MessageViewer::MailWebEngineView *mTestWebEngine;
 };
 
 #endif // TESTMAILWEBENGINE_H
diff --git a/webengineviewer/src/tests/testwebengineaccesskey.cpp b/messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.cpp
similarity index 100%
rename from webengineviewer/src/tests/testwebengineaccesskey.cpp
rename to messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.cpp
diff --git a/webengineviewer/src/tests/testwebengineaccesskey.h b/messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.h
similarity index 100%
rename from webengineviewer/src/tests/testwebengineaccesskey.h
rename to messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.h
diff --git a/webengineviewer/src/tests/testwebenginescrolladdattachment.cpp b/messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.cpp
similarity index 94%
rename from webengineviewer/src/tests/testwebenginescrolladdattachment.cpp
rename to messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.cpp
index e04fd90bc57272650dd61ed6dcb93245ac26eae5..d2a525fdc82ca1d3dc50a7543a03cc99394e5103 100644
--- a/webengineviewer/src/tests/testwebenginescrolladdattachment.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.cpp
@@ -24,7 +24,7 @@
 #include <QVBoxLayout>
 #include <QWebEngineSettings>
 
-#include <webengineviewer/mailwebengineview.h>
+#include <messageviewer/mailwebengineview.h>
 
 template<typename Arg, typename R, typename C>
 struct InvokeWrapper {
@@ -49,7 +49,7 @@ TestWebEngineScrollAddAttachment::TestWebEngineScrollAddAttachment(QWidget *pare
 {
     QVBoxLayout *vboxLayout = new QVBoxLayout(this);
 
-    mTestWebEngine = new WebEngineViewer::MailWebEngineView(new KActionCollection(this), this);
+    mTestWebEngine = new MessageViewer::MailWebEngineView(new KActionCollection(this), this);
     mTestWebEngine->settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, true);
     vboxLayout->addWidget(mTestWebEngine);
     mTestWebEngine->load(QUrl(QStringLiteral("http://www.kde.org")));
diff --git a/webengineviewer/src/tests/testwebenginescrolladdattachment.h b/messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.h
similarity index 93%
rename from webengineviewer/src/tests/testwebenginescrolladdattachment.h
rename to messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.h
index 429349eec728a8a9953e2af0f22db91cda9dac94..e2c7b05ccc56b49559f1ce65709fd797f284ad0e 100644
--- a/webengineviewer/src/tests/testwebenginescrolladdattachment.h
+++ b/messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.h
@@ -19,7 +19,7 @@
 #define TESTWEBENGINESCROLLADDATTACHMENT_H
 
 #include <QWidget>
-namespace WebEngineViewer
+namespace MessageViewer
 {
 class MailWebEngineView;
 }
@@ -32,7 +32,7 @@ public:
 private Q_SLOTS:
     void slotScrollToAttachment();
 private:
-    WebEngineViewer::MailWebEngineView *mTestWebEngine;
+    MessageViewer::MailWebEngineView *mTestWebEngine;
 };
 
 #endif // TESTWEBENGINESCROLLADDATTACHMENT_H
diff --git a/webengineviewer/src/tests/CMakeLists.txt b/webengineviewer/src/tests/CMakeLists.txt
index 240baccc658fb28e82bd4351f21d40dc0061f5b8..fa2b44f12c03265faf830f018d3d6a0ec4bf8e98 100644
--- a/webengineviewer/src/tests/CMakeLists.txt
+++ b/webengineviewer/src/tests/CMakeLists.txt
@@ -19,40 +19,3 @@ target_link_libraries(webenginescripttest
     Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets
     )
 
-######
-if (NOT MESSAGEVIEWER_USE_QTWEBENGINE)
-set(webengineaccesskey_test_SRCS
-    testwebengineaccesskey.cpp
-    )
-
-add_executable(webengineaccesskeytest ${webengineaccesskey_test_SRCS})
-
-target_link_libraries(webengineaccesskeytest
-    Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes KF5::WebKit Qt5::WebKitWidgets
-    )
-endif()
-####
-
-#laurent move to messageviewer test
-if (0)
-set(scrolladdattachment_test_SRCS
-    testwebenginescrolladdattachment.cpp
-    )
-
-add_executable(scrolladdattachmenttest ${scrolladdattachment_test_SRCS})
-
-target_link_libraries(scrolladdattachmenttest
-    Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes
-    )
-
-####
-set(testmailwebengine_test_SRCS
-    testmailwebengine.cpp
-    )
-
-add_executable(testmailwebengine ${testmailwebengine_test_SRCS})
-
-target_link_libraries(testmailwebengine
-    Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes
-    )
-endif()