diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..a6bcaf8ce
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+assets/init-doc/*          binary
+core/coreunix/test_data/** binary
diff --git a/cmd/ipfs/util/ulimit_test.go b/cmd/ipfs/util/ulimit_test.go
index ffba72ea8..2fcc9f413 100644
--- a/cmd/ipfs/util/ulimit_test.go
+++ b/cmd/ipfs/util/ulimit_test.go
@@ -1,3 +1,5 @@
+// +build !windows
+
 package util
 
 import (
diff --git a/pin/pin_test.go b/pin/pin_test.go
index 3652ef8e7..c0137a0d3 100644
--- a/pin/pin_test.go
+++ b/pin/pin_test.go
@@ -16,10 +16,12 @@ import (
 	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
 )
 
+var rand = util.NewTimeSeededRand()
+
 func randNode() (*mdag.ProtoNode, *cid.Cid) {
 	nd := new(mdag.ProtoNode)
 	nd.SetData(make([]byte, 32))
-	util.NewTimeSeededRand().Read(nd.Data())
+	rand.Read(nd.Data())
 	k := nd.Cid()
 	return nd, k
 }
diff --git a/repo/fsrepo/serialize/serialize_test.go b/repo/fsrepo/serialize/serialize_test.go
index 4547a4b80..443024ed8 100644
--- a/repo/fsrepo/serialize/serialize_test.go
+++ b/repo/fsrepo/serialize/serialize_test.go
@@ -2,6 +2,7 @@ package fsrepo
 
 import (
 	"os"
+	"runtime"
 	"testing"
 
 	config "github.com/ipfs/go-ipfs/repo/config"
@@ -27,7 +28,10 @@ func TestConfig(t *testing.T) {
 	if err != nil {
 		t.Fatalf("cannot stat config file: %v", err)
 	}
-	if g := st.Mode().Perm(); g&0117 != 0 {
-		t.Fatalf("config file should not be executable or accessible to world: %v", g)
+
+	if runtime.GOOS != "windows" { // see https://golang.org/src/os/types_windows.go
+		if g := st.Mode().Perm(); g&0117 != 0 {
+			t.Fatalf("config file should not be executable or accessible to world: %v", g)
+		}
 	}
 }
diff --git a/routing/mock/centralized_test.go b/routing/mock/centralized_test.go
index 00ca6aec0..8d056a139 100644
--- a/routing/mock/centralized_test.go
+++ b/routing/mock/centralized_test.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	delay "github.com/ipfs/go-ipfs/thirdparty/delay"
-	"gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
 
 	u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
+	testutil "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
 	pstore "gx/ipfs/QmXauCuJzmzapetmC6W4TuDJLL1yFFrVzSHoWv8YdbmnxH/go-libp2p-peerstore"
 	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
 )
@@ -164,6 +164,8 @@ func TestValidAfter(t *testing.T) {
 	}
 
 	conf.ValueVisibility.Set(0)
+	time.Sleep(100 * time.Millisecond)
+
 	providersChan = rs.Client(pi).FindProvidersAsync(ctx, key, max)
 	t.Log("providers", providers)
 	for p := range providersChan {