diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go
index 19e54c21dda1654659123914dc632988b2c58fbc..ca82cfd4c9eae90ca1351ea5a5d4264ab6d7e170 100644
--- a/cmd/swarm/export_test.go
+++ b/cmd/swarm/export_test.go
@@ -123,6 +123,9 @@ func TestCLISwarmExportImport(t *testing.T) {
 // 5. import the dump
 // 6. file should be accessible
 func TestExportLegacyToNew(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip() // this should be reenabled once the appveyor tests underlying issue is fixed
+	}
 	/*
 		fixture	bzz account 0aa159029fa13ffa8fa1c6fff6ebceface99d6a4
 	*/
@@ -170,7 +173,7 @@ func TestExportLegacyToNew(t *testing.T) {
 	if stat.Size() < 90000 {
 		t.Fatal("export size too small")
 	}
-	t.Log("removing chunk datadir")
+	log.Info("removing chunk datadir")
 	err = os.RemoveAll(path.Join(actualDataDir, "chunks"))
 	if err != nil {
 		t.Fatal(err)
@@ -276,6 +279,7 @@ func inflateBase64Gzip(t *testing.T, base64File, directory string) {
 			if _, err := io.Copy(file, tarReader); err != nil {
 				t.Fatal(err)
 			}
+			file.Close()
 		default:
 			t.Fatal("shouldn't happen")
 		}
diff --git a/swarm/network/simulation/kademlia_test.go b/swarm/network/simulation/kademlia_test.go
index 4d7dc6240443a6eb921065af2902421e41820e39..af50aacfd929a36e2ef70022a1c7cd3be90e819b 100644
--- a/swarm/network/simulation/kademlia_test.go
+++ b/swarm/network/simulation/kademlia_test.go
@@ -42,7 +42,7 @@ import (
 		* If all kademlias are healthy, the test succeeded, otherwise it failed
 */
 func TestWaitTillHealthy(t *testing.T) {
-
+	t.Skip("this test is flaky; disabling till underlying problem is solved")
 	testNodesNum := 10
 
 	// create the first simulation