diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15fa628..6123a0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,6 @@ set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libx
 
 ########### Targets ###########
 remove_definitions( -DQT_NO_CAST_FROM_ASCII )
-option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 
 option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)
 
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 3932c3a..62b6d85 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,12 +1,7 @@
-if (KDEPIM_RUN_AKONADI_TEST)
-	set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-	set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
-	set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-	add_akonadi_isolated_test(foldertreewidgettest.cpp)
-	target_link_libraries(foldertreewidgettest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon)
-
-	add_akonadi_isolated_test(favoritestest.cpp)
-	target_link_libraries(favoritestest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon)
-endif()	
+add_akonadi_isolated_test(foldertreewidgettest.cpp)
+target_link_libraries(foldertreewidgettest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon)
 
+add_akonadi_isolated_test(favoritestest.cpp)
+target_link_libraries(favoritestest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon)
diff --git a/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt
index 1e0aa7c..993b4dd 100644
--- a/src/filter/autotests/CMakeLists.txt
+++ b/src/filter/autotests/CMakeLists.txt
@@ -118,7 +118,6 @@ add_mailcommon_filter_test(filteractionwithaddresstest
     ${filter_common_SRCS}
 )
 
-if (KDEPIM_RUN_AKONADI_TEST)
 add_mailcommon_filter_akonadi_test(filteractionaddtoaddressbooktest.cpp
     filteractionaddtoaddressbooktest.cpp
     ../filteractions/filteractionaddtoaddressbook.cpp
@@ -126,7 +125,6 @@ add_mailcommon_filter_akonadi_test(filteractionaddtoaddressbooktest.cpp
     ../filteractions/filteractionwithstring.cpp
     ${filter_common_SRCS}
 )
-endif()
 
 add_mailcommon_filter_test(filteractionplaysoundtest
     filteractionplaysoundtest.cpp
diff --git a/src/filter/filterimporter/autotests/CMakeLists.txt b/src/filter/filterimporter/autotests/CMakeLists.txt
index f65a6ac..4f381fd 100644
--- a/src/filter/filterimporter/autotests/CMakeLists.txt
+++ b/src/filter/filterimporter/autotests/CMakeLists.txt
@@ -1,13 +1,8 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-if (KDEPIM_RUN_AKONADI_TEST)
-	set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
-	set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
-
-	add_akonadi_isolated_test_advanced(filterimportclawmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
-	add_akonadi_isolated_test_advanced(filterimportthunderbirdtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
-	add_akonadi_isolated_test_advanced(filterimportbalsatest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
-	add_akonadi_isolated_test_advanced(filterimportevolutiontest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
-	add_akonadi_isolated_test_advanced(filterimportprocmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
-	add_akonadi_isolated_test_advanced(filterimportsylpheedtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
-	add_akonadi_isolated_test_advanced(filterimportergmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
-endif()	
+add_akonadi_isolated_test_advanced(filterimportclawmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
+add_akonadi_isolated_test_advanced(filterimportthunderbirdtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
+add_akonadi_isolated_test_advanced(filterimportbalsatest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
+add_akonadi_isolated_test_advanced(filterimportevolutiontest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
+add_akonadi_isolated_test_advanced(filterimportprocmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
+add_akonadi_isolated_test_advanced(filterimportsylpheedtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
+add_akonadi_isolated_test_advanced(filterimportergmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")