diff --git a/server/client.go b/server/client.go
index f1afd12c0..8a0a20249 100644
--- a/server/client.go
+++ b/server/client.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/cluster_config.go b/server/cluster_config.go
index 1e6dca91b..c2beda4aa 100644
--- a/server/cluster_config.go
+++ b/server/cluster_config.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/join_command.go b/server/join_command.go
index 8a8318e6c..600118d86 100644
--- a/server/join_command.go
+++ b/server/join_command.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/listener.go b/server/listener.go
index 1c1389750..4de5d05eb 100644
--- a/server/listener.go
+++ b/server/listener.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/package_stats.go b/server/package_stats.go
index 519168033..bd439463b 100644
--- a/server/package_stats.go
+++ b/server/package_stats.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/peer_server.go b/server/peer_server.go
index eda20fc3d..1f68bfad3 100644
--- a/server/peer_server.go
+++ b/server/peer_server.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/peer_server_handlers.go b/server/peer_server_handlers.go
index 2696956de..4c3ba9020 100644
--- a/server/peer_server_handlers.go
+++ b/server/peer_server_handlers.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/raft_follower_stats.go b/server/raft_follower_stats.go
index 1166c02d6..3f43af8f3 100644
--- a/server/raft_follower_stats.go
+++ b/server/raft_follower_stats.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/raft_server_stats.go b/server/raft_server_stats.go
index dea4a4cf2..e2e96812c 100644
--- a/server/raft_server_stats.go
+++ b/server/raft_server_stats.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/registry.go b/server/registry.go
index 7ddcb5048..1df5565ee 100644
--- a/server/registry.go
+++ b/server/registry.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/release_version.go b/server/release_version.go
index ce1ee1e3e..87e2fd16c 100644
--- a/server/release_version.go
+++ b/server/release_version.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 const ReleaseVersion = "0.4.6+git"
diff --git a/server/remove_command.go b/server/remove_command.go
index 841ca0313..481ac06f2 100644
--- a/server/remove_command.go
+++ b/server/remove_command.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/server.go b/server/server.go
index 9d82d889c..b1493c4d3 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/set_cluster_config_command.go b/server/set_cluster_config_command.go
index bc9b14277..eb21bae6f 100644
--- a/server/set_cluster_config_command.go
+++ b/server/set_cluster_config_command.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/standby_server.go b/server/standby_server.go
index d0b35f737..3dd61112a 100644
--- a/server/standby_server.go
+++ b/server/standby_server.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/stats_queue.go b/server/stats_queue.go
index 8ee689c0a..349a5592f 100644
--- a/server/stats_queue.go
+++ b/server/stats_queue.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/tls_info.go b/server/tls_info.go
index afcfbadae..defdfd00c 100644
--- a/server/tls_info.go
+++ b/server/tls_info.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/transporter.go b/server/transporter.go
index 2e24c8a60..333c93054 100644
--- a/server/transporter.go
+++ b/server/transporter.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 import (
diff --git a/server/v2/delete_handler.go b/server/v2/delete_handler.go
index 65024bd48..6fe77f6f4 100644
--- a/server/v2/delete_handler.go
+++ b/server/v2/delete_handler.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package v2
 
 import (
diff --git a/server/v2/get_handler.go b/server/v2/get_handler.go
index a452b9bd8..671e297cd 100644
--- a/server/v2/get_handler.go
+++ b/server/v2/get_handler.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package v2
 
 import (
diff --git a/server/v2/post_handler.go b/server/v2/post_handler.go
index 40c9f1f7d..face97203 100644
--- a/server/v2/post_handler.go
+++ b/server/v2/post_handler.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package v2
 
 import (
diff --git a/server/v2/put_handler.go b/server/v2/put_handler.go
index aa912a295..305109fcb 100644
--- a/server/v2/put_handler.go
+++ b/server/v2/put_handler.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package v2
 
 import (
diff --git a/server/v2/v2.go b/server/v2/v2.go
index 72a59d9d7..c65fd022f 100644
--- a/server/v2/v2.go
+++ b/server/v2/v2.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package v2
 
 import (
diff --git a/server/version.go b/server/version.go
index 1d0fc6a4b..44a2dc288 100644
--- a/server/version.go
+++ b/server/version.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package server
 
 const Version = "v2"
diff --git a/tests/functional/discovery_test.go b/tests/functional/discovery_test.go
index 1826b2205..6a22ae9e5 100644
--- a/tests/functional/discovery_test.go
+++ b/tests/functional/discovery_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/etcd_direct_call.go b/tests/functional/etcd_direct_call.go
index 6f629b4fd..e5ff5df54 100644
--- a/tests/functional/etcd_direct_call.go
+++ b/tests/functional/etcd_direct_call.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/etcd_tls_test.go b/tests/functional/etcd_tls_test.go
index 367700816..8f857c2d8 100644
--- a/tests/functional/etcd_tls_test.go
+++ b/tests/functional/etcd_tls_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/init.go b/tests/functional/init.go
index 48e4284b1..56210d48c 100644
--- a/tests/functional/init.go
+++ b/tests/functional/init.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/internal_version_test.go b/tests/functional/internal_version_test.go
index d15f93d74..4c6866174 100644
--- a/tests/functional/internal_version_test.go
+++ b/tests/functional/internal_version_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/kill_leader_test.go b/tests/functional/kill_leader_test.go
index 80f2cee74..ce944998f 100644
--- a/tests/functional/kill_leader_test.go
+++ b/tests/functional/kill_leader_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/multi_node_kill_all_and_recovery_test.go b/tests/functional/multi_node_kill_all_and_recovery_test.go
index 451af4d65..13368823b 100644
--- a/tests/functional/multi_node_kill_all_and_recovery_test.go
+++ b/tests/functional/multi_node_kill_all_and_recovery_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/rejoin_test.go b/tests/functional/rejoin_test.go
index d0b1e1f54..d36f1fe36 100644
--- a/tests/functional/rejoin_test.go
+++ b/tests/functional/rejoin_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/remove_node_test.go b/tests/functional/remove_node_test.go
index c80521165..88021223b 100644
--- a/tests/functional/remove_node_test.go
+++ b/tests/functional/remove_node_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/simple_multi_node_test.go b/tests/functional/simple_multi_node_test.go
index 31c627b29..966f2bf0f 100644
--- a/tests/functional/simple_multi_node_test.go
+++ b/tests/functional/simple_multi_node_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/simple_snapshot_test.go b/tests/functional/simple_snapshot_test.go
index c238d8691..1c77661bd 100644
--- a/tests/functional/simple_snapshot_test.go
+++ b/tests/functional/simple_snapshot_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/standby_test.go b/tests/functional/standby_test.go
index b216ee3a5..87d605948 100644
--- a/tests/functional/standby_test.go
+++ b/tests/functional/standby_test.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package test
 
 import (
diff --git a/tests/functional/util.go b/tests/functional/util.go
index 36a72c39a..abd74b592 100644
--- a/tests/functional/util.go
+++ b/tests/functional/util.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 /*
 Copyright 2013 CoreOS Inc.
 
diff --git a/tests/http_utils.go b/tests/http_utils.go
index 408ded7bc..b8e02465a 100644
--- a/tests/http_utils.go
+++ b/tests/http_utils.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package tests
 
 import (
diff --git a/tests/mock/mock_store.go b/tests/mock/mock_store.go
index cb2a5cfdc..a0d88b747 100644
--- a/tests/mock/mock_store.go
+++ b/tests/mock/mock_store.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package mock
 
 import (
diff --git a/tests/mock/server_v2.go b/tests/mock/server_v2.go
index ab471b22d..88af68e26 100644
--- a/tests/mock/server_v2.go
+++ b/tests/mock/server_v2.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package mock
 
 import (
diff --git a/tests/server_utils.go b/tests/server_utils.go
index d69eabbed..a0fb3c51b 100644
--- a/tests/server_utils.go
+++ b/tests/server_utils.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package tests
 
 import (
diff --git a/third_party/github.com/coreos/go-etcd/etcd/config.json b/third_party/github.com/coreos/go-etcd/etcd/config.json
index 0e271b184..bfb85cc2d 100644
--- a/third_party/github.com/coreos/go-etcd/etcd/config.json
+++ b/third_party/github.com/coreos/go-etcd/etcd/config.json
@@ -1 +1 @@
-{"config":{"certFile":"","keyFile":"","caCertFiles":null,"timeout":1000000000,"Consistency":"STRONG"},"cluster":{"leader":"http://127.0.0.1:4001","machines":["http://127.0.0.1:4001","http://127.0.0.1:4002"]}}
\ No newline at end of file
+{"config":{"certFile":"","keyFile":"","caCertFiles":null,"timeout":1000000000,"Consistency":"STRONG"},"cluster":{"leader":"http://127.0.0.1:4001","machines":["http://127.0.0.1:4001"]}}
\ No newline at end of file