diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa2b763b..2337fbd7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 # [v5.0.0]
 
+## Changes
+
+- `oneShotAction` flag in the `TestTask` class is not static anymore
+
 ## Removed
 
 - Removed the `HkSwitchHelper`. This module should not be needed anymore, now that the local
diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index 3424f986c..d1459e52f 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -21,14 +21,14 @@ pipeline {
         stage('Build') {
             steps {
                 dir(BUILDDIR) {
-                    sh 'cmake --build . -j'
+                    sh 'cmake --build . -j4'
                 }
             }
         }
         stage('Unittests') {
             steps {
                 dir(BUILDDIR) {
-                    sh 'cmake --build . -- fsfw-tests_coverage -j'
+                    sh 'cmake --build . -- fsfw-tests_coverage -j4'
                 }
             }
         }
diff --git a/tests/src/fsfw_tests/integration/task/TestTask.cpp b/tests/src/fsfw_tests/integration/task/TestTask.cpp
index 65e444e38..765f780e6 100644
--- a/tests/src/fsfw_tests/integration/task/TestTask.cpp
+++ b/tests/src/fsfw_tests/integration/task/TestTask.cpp
@@ -3,7 +3,6 @@
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 
-bool TestTask::oneShotAction = true;
 MutexIF* TestTask::testLock = nullptr;
 
 TestTask::TestTask(object_id_t objectId) : SystemObject(objectId), testMode(testModes::A) {
diff --git a/tests/src/fsfw_tests/integration/task/TestTask.h b/tests/src/fsfw_tests/integration/task/TestTask.h
index 557b50b21..cd630ee3a 100644
--- a/tests/src/fsfw_tests/integration/task/TestTask.h
+++ b/tests/src/fsfw_tests/integration/task/TestTask.h
@@ -29,7 +29,7 @@ class TestTask : public SystemObject, public ExecutableObjectIF, public HasRetur
   bool testFlag = false;
 
  private:
-  static bool oneShotAction;
+  bool oneShotAction = true;
   static MutexIF* testLock;
   StorageManagerIF* IPCStore;
 };