diff --git a/src/sequence_matcher.hh b/src/sequence_matcher.hh
index 88ae5940..95cff3a3 100644
--- a/src/sequence_matcher.hh
+++ b/src/sequence_matcher.hh
@@ -92,7 +92,7 @@ retry:
             state.push_back(index);
         }
 
-        return this->sm_count == state.size();
+        return (size_t)this->sm_count == state.size();
     };
 
 private:
diff --git a/test/Makefile.am b/test/Makefile.am
index 6b6b808b..a5a1090a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -15,6 +15,8 @@ simple-db.db: simple-db.sql
 	$(DBGEN_V)$(SQLITE3_CMD) $@ < $(srcdir)/simple-db.sql
 
 AM_CPPFLAGS = \
+	-Wall \
+	-Werror=sign-compare \
 	-I$(top_srcdir)/src \
 	$(READLINE_CFLAGS) \
 	$(SQLITE3_CFLAGS)
diff --git a/test/drive_line_buffer.cc b/test/drive_line_buffer.cc
index e00d3676..4e59fc91 100644
--- a/test/drive_line_buffer.cc
+++ b/test/drive_line_buffer.cc
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 		while (lb.read_line(offset, lv)) {
             lv.terminate();
 		    printf("%s", lv.lv_start);
-		    if ((last_offset + lv.lv_len) < offset)
+		    if ((off_t)(last_offset + lv.lv_len) < offset)
 			printf("\n");
 		    last_offset = offset;
 		}
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
                 while (lb.read_line(seq_offset, lv)) { }
 		do {
             bool ret;
-		    int lpc;
+		    size_t lpc;
 
 		    random_shuffle(index.begin(), index.end());
 		    for (lpc = 0; lpc < index.size(); lpc++) {
diff --git a/test/drive_sequencer.cc b/test/drive_sequencer.cc
index 8265a2f5..96ac439f 100644
--- a/test/drive_sequencer.cc
+++ b/test/drive_sequencer.cc
@@ -87,7 +87,7 @@ private:
 
 int main(int argc, char *argv[])
 {
-    int c, retval = EXIT_SUCCESS;
+    int retval = EXIT_SUCCESS;
     const char *errptr;
     auto_fd fd;
     pcre *code;
diff --git a/test/scripty.cc b/test/scripty.cc
index 3585cd5f..de6a3ed7 100644
--- a/test/scripty.cc
+++ b/test/scripty.cc
@@ -213,7 +213,7 @@ static char *hex2bits(const char *src)
     len = strlen(src) / 2;
     retval = new char[sizeof(uint32_t) + len];
     *((uint32_t *)retval) = len;
-    while (pos < (sizeof(uint32_t) + len)) {
+    while ((size_t)pos < (sizeof(uint32_t) + len)) {
 	int val;
 	
 	sscanf(src, "%2x", &val);
diff --git a/test/test_line_buffer2.cc b/test/test_line_buffer2.cc
index d0e78b76..5d922d8f 100644
--- a/test/test_line_buffer2.cc
+++ b/test/test_line_buffer2.cc
@@ -52,7 +52,7 @@ static void single_line(const char *data, int lendiff)
     lb.set_fd(pi[0]);
     ret = lb.read_line(off, lv);
     assert(ret);
-    assert(off == strlen(data));
+    assert(off == (off_t)strlen(data));
     assert(lv.lv_len == strlen(data) - lendiff);
     
     ret = lb.read_line(off, lv);