diff --git a/test/unit/lwip_check.h b/test/unit/lwip_check.h
index 82dc41f4..2126e2ff 100644
--- a/test/unit/lwip_check.h
+++ b/test/unit/lwip_check.h
@@ -14,8 +14,8 @@
 #define EXPECT_RETNULL(x) EXPECT_RETX(x, NULL)
 
 typedef struct {
-	TFun func;
-	const char *name;
+  TFun func;
+  const char *name;
 } testfunc;
 
 #define TESTFUNC(x) {(x), "" # x "" }
@@ -28,20 +28,10 @@ typedef struct {
 typedef Suite* (suite_getter_fn)(void);
 
 /** Create a test suite */
-static Suite* create_suite(const char* name, testfunc *tests, size_t num_tests, SFun setup, SFun teardown)
-{
-  size_t i;
-  Suite *s = suite_create(name);
+Suite* create_suite(const char* name, testfunc *tests, size_t num_tests, SFun setup, SFun teardown);
 
-  for(i = 0; i < num_tests; i++) {
-    TCase *tc_core = tcase_create(name);
-    if ((setup != NULL) || (teardown != NULL)) {
-      tcase_add_checked_fixture(tc_core, setup, teardown);
-    }
-    tcase_add_named_test(tc_core, tests[i]);
-    suite_add_tcase(s, tc_core);
-  }
-  return s;
-}
+#ifdef LWIP_UNITTESTS_LIB
+int lwip_unittests_run(void)
+#endif
 
 #endif /* LWIP_HDR_LWIP_CHECK_H__ */
diff --git a/test/unit/lwip_unittests.c b/test/unit/lwip_unittests.c
index 41d1f361..b702884a 100644
--- a/test/unit/lwip_unittests.c
+++ b/test/unit/lwip_unittests.c
@@ -10,8 +10,27 @@
 
 #include "lwip/init.h"
 
+Suite* create_suite(const char* name, testfunc *tests, size_t num_tests, SFun setup, SFun teardown)
+{
+  size_t i;
+  Suite *s = suite_create(name);
 
-int main()
+  for(i = 0; i < num_tests; i++) {
+    TCase *tc_core = tcase_create(name);
+    if ((setup != NULL) || (teardown != NULL)) {
+      tcase_add_checked_fixture(tc_core, setup, teardown);
+    }
+    tcase_add_named_test(tc_core, tests[i]);
+    suite_add_tcase(s, tc_core);
+  }
+  return s;
+}
+
+#ifdef LWIP_UNITTESTS_LIB
+int lwip_unittests_run(void)
+#else
+int main(void)
+#endif
 {
   int number_failed;
   SRunner *sr;
diff --git a/test/unit/tcp/test_tcp_oos.c b/test/unit/tcp/test_tcp_oos.c
index 269e151c..6d99f774 100644
--- a/test/unit/tcp/test_tcp_oos.c
+++ b/test/unit/tcp/test_tcp_oos.c
@@ -36,6 +36,7 @@ static int tcp_oos_count(struct tcp_pcb* pcb)
   return num;
 }
 
+#if TCP_OOSEQ_MAX_PBUFS && (TCP_OOSEQ_MAX_PBUFS < ((TCP_WND / TCP_MSS) + 1)) && (PBUF_POOL_BUFSIZE >= (TCP_MSS + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN))
 /** Get the numbers of pbufs on the ooseq list */
 static int tcp_oos_pbuf_count(struct tcp_pcb* pcb)
 {
@@ -47,6 +48,7 @@ static int tcp_oos_pbuf_count(struct tcp_pcb* pcb)
   }
   return num;
 }
+#endif
 
 /** Get the seqno of a segment (by index) on the ooseq list
  *
@@ -562,7 +564,7 @@ START_TEST(test_tcp_recv_ooseq_overrun_rxwin_edge)
   int datalen = 0;
   int datalen2;
 
-  for(i = 0; i < sizeof(data_full_wnd); i++) {
+  for(i = 0; i < (int)sizeof(data_full_wnd); i++) {
     data_full_wnd[i] = (char)i;
   }