diff --git a/automation/Dockerfile b/automation/Dockerfile
index 0526d8f0..93a4fe7d 100644
--- a/automation/Dockerfile
+++ b/automation/Dockerfile
@@ -5,4 +5,4 @@ RUN apt-get --yes upgrade
 
 #tzdata is a dependency, won't install otherwise
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get --yes install gcc g++ cmake lcov git nano
+RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano
diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index 0cb973bd..d4a8e2ab 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -55,5 +55,18 @@ pipeline {
                 }
             }
         }
+        stage('Valgrind') {
+            agent {
+                dockerfile {
+                    dir 'automation'
+                    reuseNode true
+                }
+            }
+            steps {
+                dir(BUILDDIR) {
+                    sh 'valgrind --leak-check=full --error-exitcode=1 ./fsfw-tests'
+                }
+            }
+        }
     }
 }
diff --git a/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp b/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp
index 819401ab..0be8b2a7 100644
--- a/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp
+++ b/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp
@@ -78,7 +78,7 @@ TEST_CASE("Ring Buffer Test" , "[RingBufferTest]") {
 TEST_CASE("Ring Buffer Test2" , "[RingBufferTest2]") {
 	uint8_t testData[13]= {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
 	uint8_t readBuffer[10] = {13, 13, 13, 13, 13, 13, 13, 13, 13, 13};
-	uint8_t* newBuffer = new uint8_t[10];
+	uint8_t* newBuffer = new uint8_t[15];
 	SimpleRingBuffer ringBuffer(newBuffer, 10, true, 5);
 
 	SECTION("Simple Test") {
@@ -168,7 +168,7 @@ TEST_CASE("Ring Buffer Test2" , "[RingBufferTest2]") {
 TEST_CASE("Ring Buffer Test3" , "[RingBufferTest3]") {
 	uint8_t testData[13]= {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
 	uint8_t readBuffer[10] = {13, 13, 13, 13, 13, 13, 13, 13, 13, 13};
-	uint8_t* newBuffer = new uint8_t[10];
+	uint8_t* newBuffer = new uint8_t[25];
 	SimpleRingBuffer ringBuffer(newBuffer, 10, true, 15);
 
 	SECTION("Simple Test") {
diff --git a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
index 7b2f9412..b1160254 100644
--- a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
+++ b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
@@ -143,7 +143,7 @@ TEST_CASE("LocalPoolManagerTest" , "[LocManTest]") {
         CHECK(cdsShort.msDay_h == Catch::Approx(timeCdsNow.msDay_h).margin(1));
         CHECK(cdsShort.msDay_hh == Catch::Approx(timeCdsNow.msDay_hh).margin(1));
         CHECK(cdsShort.msDay_l == Catch::Approx(timeCdsNow.msDay_l).margin(1));
-        CHECK(cdsShort.msDay_ll == Catch::Approx(timeCdsNow.msDay_ll).margin(1));
+        CHECK(cdsShort.msDay_ll == Catch::Approx(timeCdsNow.msDay_ll).margin(5));
     }
 
     SECTION("VariableSnapshotTest") {
@@ -205,7 +205,7 @@ TEST_CASE("LocalPoolManagerTest" , "[LocManTest]") {
         CHECK(cdsShort.msDay_h == Catch::Approx(timeCdsNow.msDay_h).margin(1));
         CHECK(cdsShort.msDay_hh == Catch::Approx(timeCdsNow.msDay_hh).margin(1));
         CHECK(cdsShort.msDay_l == Catch::Approx(timeCdsNow.msDay_l).margin(1));
-        CHECK(cdsShort.msDay_ll == Catch::Approx(timeCdsNow.msDay_ll).margin(1));
+        CHECK(cdsShort.msDay_ll == Catch::Approx(timeCdsNow.msDay_ll).margin(5));
     }
 
     SECTION("VariableNotificationTest") {