diff --git a/caddyhttp/httpserver/server.go b/caddyhttp/httpserver/server.go
index 3bd3593e3..8dace1ee3 100644
--- a/caddyhttp/httpserver/server.go
+++ b/caddyhttp/httpserver/server.go
@@ -394,11 +394,10 @@ func makeHTTPServer(addr string, group []*SiteConfig) *http.Server {
 	}
 
 	// set the final values on the server
-	// TODO: ReadHeaderTimeout and IdleTimeout require Go 1.8
 	s.ReadTimeout = min.ReadTimeout
-	// s.ReadHeaderTimeout = min.ReadHeaderTimeout
+	s.ReadHeaderTimeout = min.ReadHeaderTimeout
 	s.WriteTimeout = min.WriteTimeout
-	// s.IdleTimeout = min.IdleTimeout
+	s.IdleTimeout = min.IdleTimeout
 
 	return s
 }
diff --git a/caddyhttp/httpserver/server_test.go b/caddyhttp/httpserver/server_test.go
index 46b53925a..dc926c596 100644
--- a/caddyhttp/httpserver/server_test.go
+++ b/caddyhttp/httpserver/server_test.go
@@ -100,15 +100,14 @@ func TestMakeHTTPServer(t *testing.T) {
 		if got, want := actual.ReadTimeout, tc.expected.ReadTimeout; got != want {
 			t.Errorf("Test %d: Expected ReadTimeout=%v, but was %v", i, want, got)
 		}
-		// TODO: ReadHeaderTimeout and IdleTimeout require Go 1.8
-		// if got, want := actual.ReadHeaderTimeout, tc.expected.ReadHeaderTimeout; got != want {
-		// 	t.Errorf("Test %d: Expected ReadHeaderTimeout=%v, but was %v", i, want, got)
-		// }
+		if got, want := actual.ReadHeaderTimeout, tc.expected.ReadHeaderTimeout; got != want {
+			t.Errorf("Test %d: Expected ReadHeaderTimeout=%v, but was %v", i, want, got)
+		}
 		if got, want := actual.WriteTimeout, tc.expected.WriteTimeout; got != want {
 			t.Errorf("Test %d: Expected WriteTimeout=%v, but was %v", i, want, got)
 		}
-		// if got, want := actual.IdleTimeout, tc.expected.IdleTimeout; got != want {
-		// 	t.Errorf("Test %d: Expected IdleTimeout=%v, but was %v", i, want, got)
-		// }
+		if got, want := actual.IdleTimeout, tc.expected.IdleTimeout; got != want {
+			t.Errorf("Test %d: Expected IdleTimeout=%v, but was %v", i, want, got)
+		}
 	}
 }