diff --git a/src/test/TestStretcher.cpp b/src/test/TestStretcher.cpp
index fc72d99..f305217 100644
--- a/src/test/TestStretcher.cpp
+++ b/src/test/TestStretcher.cpp
@@ -46,10 +46,10 @@ BOOST_AUTO_TEST_CASE(engine_version)
 {
     RubberBandStretcher s2(44100, 1, RubberBandStretcher::OptionEngineFaster);
     BOOST_TEST(s2.getEngineVersion() == 2);
-    BOOST_TEST(s2.getProcessSizeLimit() == 524288);
+    BOOST_TEST(s2.getProcessSizeLimit() == 524288u);
     RubberBandStretcher s3(44100, 1, RubberBandStretcher::OptionEngineFiner);
     BOOST_TEST(s3.getEngineVersion() == 3);
-    BOOST_TEST(s3.getProcessSizeLimit() == 524288);
+    BOOST_TEST(s3.getProcessSizeLimit() == 524288u);
 }
 
 BOOST_AUTO_TEST_CASE(sinusoid_unchanged_offline_faster)
@@ -76,10 +76,10 @@ BOOST_AUTO_TEST_CASE(sinusoid_unchanged_offline_faster)
     stretcher.process(&inp, n, true);
     BOOST_TEST(stretcher.available() == n);
 
-    BOOST_TEST(stretcher.getStartDelay() == 0); // offline mode
+    BOOST_TEST(stretcher.getStartDelay() == 0u); // offline mode
     
     size_t got = stretcher.retrieve(&outp, n);
-    BOOST_TEST(got == n);
+    BOOST_TEST(got == size_t(n));
     BOOST_TEST(stretcher.available() == -1);
 
     // We now have n samples of a simple sinusoid with stretch factor
@@ -133,10 +133,10 @@ BOOST_AUTO_TEST_CASE(sinusoid_unchanged_offline_finer)
     stretcher.process(&inp, n, true);
     BOOST_TEST(stretcher.available() == n);
 
-    BOOST_TEST(stretcher.getStartDelay() == 0); // offline mode
+    BOOST_TEST(stretcher.getStartDelay() == 0u); // offline mode
     
     size_t got = stretcher.retrieve(&outp, n);
-    BOOST_TEST(got == n);
+    BOOST_TEST(got == size_t(n));
     BOOST_TEST(stretcher.available() == -1);
 
     // The R3 engine is actually less precise than R2 here because of
@@ -186,10 +186,10 @@ BOOST_AUTO_TEST_CASE(sinusoid_2x_offline_finer)
     stretcher.process(&inp, n, true);
     BOOST_TEST(stretcher.available() == n*2);
 
-    BOOST_TEST(stretcher.getStartDelay() == 0); // offline mode
+    BOOST_TEST(stretcher.getStartDelay() == 0u); // offline mode
     
     size_t got = stretcher.retrieve(&outp, n*2);
-    BOOST_TEST(got == n*2);
+    BOOST_TEST(got == size_t(n)*2);
     BOOST_TEST(stretcher.available() == -1);
 
     int period = -1;
@@ -774,10 +774,10 @@ BOOST_AUTO_TEST_CASE(impulses_2x_offline_faster)
     stretcher.process(&inp, n, true);
     BOOST_TEST(stretcher.available() == n * 2);
 
-    BOOST_TEST(stretcher.getStartDelay() == 0); // offline mode
+    BOOST_TEST(stretcher.getStartDelay() == 0u); // offline mode
     
     size_t got = stretcher.retrieve(&outp, n * 2);
-    BOOST_TEST(got == n * 2);
+    BOOST_TEST(got == size_t(n) * 2);
     BOOST_TEST(stretcher.available() == -1);
 
     int peak0 = -1, peak1 = -1, peak2 = -1;
@@ -843,10 +843,10 @@ BOOST_AUTO_TEST_CASE(impulses_2x_offline_finer)
     stretcher.process(&inp, n, true);
     BOOST_TEST(stretcher.available() == n * 2);
 
-    BOOST_TEST(stretcher.getStartDelay() == 0); // offline mode
+    BOOST_TEST(stretcher.getStartDelay() == 0u); // offline mode
     
     size_t got = stretcher.retrieve(&outp, n * 2);
-    BOOST_TEST(got == n * 2);
+    BOOST_TEST(got == size_t(n) * 2);
     BOOST_TEST(stretcher.available() == -1);
 
     int peak0 = -1, peak1 = -1, peak2 = -1;
@@ -913,10 +913,10 @@ BOOST_AUTO_TEST_CASE(impulses_2x_5up_offline_finer)
     stretcher.process(&inp, n, true);
     BOOST_TEST(stretcher.available() == n * 2);
 
-    BOOST_TEST(stretcher.getStartDelay() == 0); // offline mode
+    BOOST_TEST(stretcher.getStartDelay() == 0u); // offline mode
     
     size_t got = stretcher.retrieve(&outp, n * 2);
-    BOOST_TEST(got == n * 2);
+    BOOST_TEST(got == size_t(n) * 2);
     BOOST_TEST(stretcher.available() == -1);
 
     int peak0 = -1, peak1 = -1, peak2 = -1;
@@ -1424,7 +1424,7 @@ static void with_resets(RubberBandStretcher::Options options,
             stretcher->process(&inp, n, true);
             BOOST_TEST(stretcher->available() == nOut);
 
-            BOOST_TEST(stretcher->getStartDelay() == 0); // offline mode
+            BOOST_TEST(stretcher->getStartDelay() == 0u); // offline mode
     
             nActual = (int)stretcher->retrieve(&outp, nOut);
             BOOST_TEST(nActual == nOut);