diff --git a/tests/test_opencl_merge.cpp b/tests/test_opencl_merge.cpp
index 443939c9b..53916196e 100644
--- a/tests/test_opencl_merge.cpp
+++ b/tests/test_opencl_merge.cpp
@@ -32,10 +32,10 @@
 #define CL_HPP_ENABLE_EXCEPTIONS
 #include <CL/opencl.hpp>
 
-#include <cinttypes>
+#include <algorithm>
+#include <cstdint>
 #include <iostream>
 #include <random>
-#include <thread>
 #include <vector>
 
 using uint = std::uint32_t;
@@ -590,4 +590,4 @@ TEST(opencl_merge, merge_path_v2) {
     std::cout << "Time taken for Merge Cpu: " << (result_time_cpu / N_RUNS).count() << " ms\n";
 }
 
-SPLA_GTEST_MAIN
\ No newline at end of file
+SPLA_GTEST_MAIN
diff --git a/tests/test_vector.cpp b/tests/test_vector.cpp
index 0ac2f3953..22763c5a2 100644
--- a/tests/test_vector.cpp
+++ b/tests/test_vector.cpp
@@ -29,6 +29,8 @@
 
 #include <spla.hpp>
 
+#include <algorithm>
+
 TEST(vector, get_set_naive) {
     const spla::uint N    = 10;
     const int        X[N] = {1, 2, 3, 4, 5, -3, -3, 5, -8, 1};
@@ -117,7 +119,7 @@ TEST(vector, reduce_plus) {
     auto istart = spla::Scalar::make_int(0);
     int  isum   = 0;
 
-    for (int k = 0; k < K; ++k) {
+    for (spla::uint k = 0; k < K; ++k) {
         ivec->set_int(I[k], X[k]);
         isum += X[k];
     }
@@ -141,11 +143,11 @@ TEST(vector, reduce_mult) {
     auto istart = spla::Scalar::make_int(1);
     int  isum   = 1;
 
-    for (int k = 0; k < N; ++k) {
+    for (spla::uint k = 0; k < N; ++k) {
         ivec->set_int(k, 1);
     }
 
-    for (int k = 0; k < K; ++k) {
+    for (spla::uint k = 0; k < K; ++k) {
         ivec->set_int(I[k], X[k]);
         isum *= X[k];
     }
@@ -253,13 +255,13 @@ TEST(vector, eadd_fdb_min) {
     auto iv   = spla::Vector::make(N, spla::INT);
     auto ifdb = spla::Vector::make(N, spla::INT);
 
-    for (int k = 0; k < N; ++k) {
+    for (spla::uint k = 0; k < N; ++k) {
         ir->set_int(k, S);
         R[k] = S;
         F[k] = 0;
     }
 
-    for (int k = 0; k < K; ++k) {
+    for (spla::uint k = 0; k < K; ++k) {
         iv->set_int(I[k], V[k]);
         R[I[k]] = std::min(R[I[k]], V[k]);
         if (R[I[k]] != S) F[I[k]] = R[I[k]];
@@ -267,13 +269,13 @@ TEST(vector, eadd_fdb_min) {
 
     spla::exec_v_eadd_fdb(ir, iv, ifdb, spla::MIN_INT);
 
-    for (int k = 0; k < N; k++) {
+    for (spla::uint k = 0; k < N; k++) {
         int r;
         ir->get_int(k, r);
         EXPECT_EQ(R[k], r);
     }
 
-    for (int k = 0; k < N; k++) {
+    for (spla::uint k = 0; k < N; k++) {
         int r;
         ifdb->get_int(k, r);
         EXPECT_EQ(F[k], r);
@@ -323,20 +325,20 @@ TEST(vector, assign_plus) {
     auto imask = spla::Vector::make(N, spla::INT);
     auto ival  = spla::Scalar::make_int(S);
 
-    for (int k = 0; k < N; ++k) {
+    for (spla::uint k = 0; k < N; ++k) {
         ivec->set_int(k, 14);
         imask->set_int(k, 0);
         R[k] = 14;
     }
 
-    for (int k = 0; k < K; ++k) {
+    for (spla::uint k = 0; k < K; ++k) {
         imask->set_int(I[k], 1);
         R[I[k]] = R[I[k]] + S;
     }
 
     spla::exec_v_assign_masked(ivec, imask, ival, spla::PLUS_INT, spla::NQZERO_INT);
 
-    for (int k = 0; k < N; k++) {
+    for (spla::uint k = 0; k < N; k++) {
         int r;
         ivec->get_int(k, r);
         EXPECT_EQ(R[k], r);
@@ -354,20 +356,20 @@ TEST(vector, assign_second) {
     auto imask = spla::Vector::make(N, spla::INT);
     auto ival  = spla::Scalar::make_int(S);
 
-    for (int k = 0; k < N; ++k) {
+    for (spla::uint k = 0; k < N; ++k) {
         ivec->set_int(k, 14);
         imask->set_int(k, 0);
         R[k] = 14;
     }
 
-    for (int k = 0; k < K; ++k) {
+    for (spla::uint k = 0; k < K; ++k) {
         imask->set_int(I[k], 1);
         R[I[k]] = S;
     }
 
     spla::exec_v_assign_masked(ivec, imask, ival, spla::SECOND_INT, spla::NQZERO_INT);
 
-    for (int k = 0; k < N; k++) {
+    for (spla::uint k = 0; k < N; k++) {
         int r;
         ivec->get_int(k, r);
         EXPECT_EQ(R[k], r);
@@ -495,4 +497,4 @@ TEST(vector, map) {
     }
 }
 
-SPLA_GTEST_MAIN_WITH_FINALIZE_PLATFORM(1)
\ No newline at end of file
+SPLA_GTEST_MAIN_WITH_FINALIZE_PLATFORM(1)