diff --git a/build/Dockerfile b/build/Dockerfile
index b65242cd..d96f3cce 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.1
+FROM golang:1.10.0-stretch
 
 # Support Raspberry Pi 2 and newer
 ENV GOARM 7
diff --git a/ipam/testutils_test.go b/ipam/testutils_test.go
index d6b2f07f..ccd6efe1 100644
--- a/ipam/testutils_test.go
+++ b/ipam/testutils_test.go
@@ -117,7 +117,7 @@ func CheckAllExpectedMessagesSent(allocs ...*Allocator) {
 		m := alloc.gossip.(*mockGossipComms)
 		m.RLock()
 		if len(m.messages) > 0 {
-			require.FailNow(m, fmt.Sprintf("%s: Gossip message(s) not sent as expected: \n%x", m.name, m.messages))
+			require.FailNow(m, fmt.Sprintf("%s: Gossip message(s) not sent as expected: \n%v", m.name, m.messages))
 		}
 		m.RUnlock()
 	}
diff --git a/vagrant-common.rb b/vagrant-common.rb
index 27cfb716..6fe92996 100644
--- a/vagrant-common.rb
+++ b/vagrant-common.rb
@@ -16,7 +16,7 @@ def ansibleize(h)
 end
 
 def get_go_version_from_build_dockerfile()
-  go_regexp = /FROM golang:(\S*).*?/
+  go_regexp = /FROM golang:([\d\.]*).*?/
   dockerfile_path = File.expand_path(File.join(File.dirname(__FILE__), 'build', 'Dockerfile'))
   go_version = File.readlines(dockerfile_path).select { |line| line.match(go_regexp) }.first.match(go_regexp).captures.first
   if go_version.nil?