diff --git a/sonar-project.properties b/sonar-project.properties
index 9a43f4a4d..b91c2436f 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,5 +1,6 @@
 sonar.projectKey=City-of-Helsinki_drupal-helfi-etusivu
 sonar.organization=city-of-helsinki
 sonar.php.coverage.reportPaths=coverage.xml
-sonar.sources=public/modules/custom/helfi_alt_lang_fallback/src,public/modules/custom/helfi_annif/src,public/modules/custom/helfi_etusivu/src,public/modules/custom/helfi_etusivu_config/src,public/modules/custom/helfi_global_navigation/src,public/modules/custom/helfi_node_news_article/src
-sonar.tests=public/modules/custom/helfi_alt_lang_fallback/tests,public/modules/custom/helfi_annif/tests,public/modules/custom/helfi_etusivu/tests,public/modules/custom/helfi_etusivu_config/tests,public/modules/custom/helfi_global_navigation/tests,public/modules/custom/helfi_node_news_article/tests
+sonar.sources=public/modules/custom
+sonar.inclusions=public/modules/custom/*/src/**/*
+sonar.test.inclusions=public/modules/custom/*/tests/src/**/*