diff --git a/services/bifrost/main.go b/services/bifrost/main.go
index 7e47ed1dd0..ecd44aa2c1 100644
--- a/services/bifrost/main.go
+++ b/services/bifrost/main.go
@@ -1,3 +1,6 @@
+// Skip this file in Go <1.8 because it's using http.Server.Shutdown
+// +build go1.8
+
 package main
 
 import (
diff --git a/services/bifrost/server/bitcoin_rail_test.go b/services/bifrost/server/bitcoin_rail_test.go
index ca01c3a1f0..084a0c56fc 100644
--- a/services/bifrost/server/bitcoin_rail_test.go
+++ b/services/bifrost/server/bitcoin_rail_test.go
@@ -1,3 +1,6 @@
+// Skip this test file in Go <1.8 because it's using http.Server.Shutdown
+// +build go1.8
+
 package server
 
 import (
diff --git a/services/bifrost/server/ethereum_rail_test.go b/services/bifrost/server/ethereum_rail_test.go
index c73124540b..ee67981124 100644
--- a/services/bifrost/server/ethereum_rail_test.go
+++ b/services/bifrost/server/ethereum_rail_test.go
@@ -1,3 +1,6 @@
+// Skip this test file in Go <1.8 because it's using http.Server.Shutdown
+// +build go1.8
+
 package server
 
 import (
diff --git a/services/bifrost/server/server.go b/services/bifrost/server/server.go
index 2aa6136be5..eb69a86ae7 100644
--- a/services/bifrost/server/server.go
+++ b/services/bifrost/server/server.go
@@ -1,3 +1,6 @@
+// Skip this file in Go <1.8 because it's using http.Server.Shutdown
+// +build go1.8
+
 package server
 
 import (