diff --git a/web/web_test.go b/web/web_test.go
index bc8f0dc..752dde5 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -3,6 +3,7 @@ package web
 import (
 	"net/http"
 	"testing"
+	"time"
 )
 
 // TestHTTPServe tries to serve a real HTTP server and load some pages
@@ -13,20 +14,39 @@ func TestHTTPServe(t *testing.T) {
 	}
 
 	go Serve(nil, nil, &Options{ListenAddress: "127.0.0.1:8081"})
+
+	// Sleep 1 second to ensure that the web server is running, to avoid fails because the request came too early
+	time.Sleep(1000000000)
+
 	// Test GET request
-	resp, _ := http.Get("http://localhost:8081/")
+	resp, err := http.Get("http://localhost:8081/")
+	if err != nil {
+		t.Error("Error while getting /:", err)
+	}
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("Viewer page returned %v != %v on GET", resp.StatusCode, http.StatusOK)
 	}
-	resp, _ = http.Get("http://localhost:8081/demo")
+
+	resp, err = http.Get("http://localhost:8081/demo")
+	if err != nil {
+		t.Error("Error while getting /demo:", err)
+	}
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("Viewer page returned %v != %v on GET", resp.StatusCode, http.StatusOK)
 	}
-	resp, _ = http.Get("http://localhost:8081/static/js/viewer.js")
+
+	resp, err = http.Get("http://localhost:8081/static/js/viewer.js")
+	if err != nil {
+		t.Error("Error while getting /static/js/viewer/js:", err)
+	}
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("Viewer page returned %v != %v on GET", resp.StatusCode, http.StatusOK)
 	}
-	resp, _ = http.Get("http://localhost:8081/_stats")
+
+	resp, err = http.Get("http://localhost:8081/_stats")
+	if err != nil {
+		t.Error("Error while getting /_stats:", err)
+	}
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("Viewer page returned %v != %v on GET", resp.StatusCode, http.StatusOK)
 	}