diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7f411da..311fc08a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@ list yields a list of all related PRs for each release.
 
 # [v1.12.0]
 
+- Build unittest as default side product of hosted builds
+- Let CI/CD build host build and run unittest side product in same step
+
 ## Changed
 
 - Better RTD names denoting their purpose (and location consequently)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54049b34..c96070b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,7 +298,11 @@ target_include_directories(${WATCHDOG_NAME} PUBLIC
 )
 
 # unittests
-add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
+if(NOT TGT_BSP)
+    add_executable(${UNITTEST_NAME})
+else()
+    add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
+endif()
 
 if(EIVE_ADD_ETL_LIB)
 endif()
diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index f8b180a1..e8ad8851 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -24,11 +24,11 @@ pipeline {
                 }
             }
         }
-        stage('Unittests') {
+        stage('Build Host and Tests') {
             steps {
                 dir(BUILDDIR_LINUX) {
                     sh 'cmake ..'
-                    sh 'cmake --build . -t eive-unittest -j4'
+                    sh 'cmake --build . -j4'
                     sh './eive-unittest'
                 }
             }