diff --git a/kernel/init.c b/kernel/init.c
index 5054dca1..2ba3b81f 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -95,7 +95,7 @@ int STDCALL network_task(void* arg)
 
 	// start echo and ping server
 	echo_init();
-	//ping_init();
+	ping_init();
 
 	while(!done) {
 		rtl8139if_wait(&netif, 0);
diff --git a/kernel/tests.c b/kernel/tests.c
index e8d8a828..8427ca56 100644
--- a/kernel/tests.c
+++ b/kernel/tests.c
@@ -117,6 +117,8 @@ static int STDCALL join_test(void* arg)
 	return 0;
 }
 
+void ping_send_now();
+
 int test_init(void)
 {
 	char* argv[] = {"/bin/tests", NULL};
@@ -135,5 +137,10 @@ int test_init(void)
 	//create_user_task(NULL, "/bin/jacobi", argv);
 	//create_user_task(NULL, "/bin/jacobi", argv);
 
+#ifdef CONFIG_LWIP
+	// use ping to test LWIP
+	ping_send_now();
+#endif
+
 	return 0;
 }
diff --git a/lwip/src/include/lwipopts.h b/lwip/src/include/lwipopts.h
index 2f9f155d..7279f5c7 100644
--- a/lwip/src/include/lwipopts.h
+++ b/lwip/src/include/lwipopts.h
@@ -65,7 +65,7 @@
  * MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts.
  * (requires NO_SYS==0)
  */
-#define MEMP_NUM_SYS_TIMEOUT	5
+#define MEMP_NUM_SYS_TIMEOUT	7
 
 /**
  * LWIP_CHECKSUM_ON_COPY==1: Calculate checksum when copying data from