diff --git a/.travis.yml b/.travis.yml
index 2d152e876f..6b84852573 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,57 +22,57 @@ jobs:
       env:
         - GO111MODULE=auto
       name: A-B tests
-      script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[a-b].*")
-    - script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/c[a-m].*")
+      script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[a-b].*")
+    - script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/c[a-m].*")
       os: linux
       dist: bionic
       go: 1.14.x
       env:
         - GO111MODULE=auto
       name: C-[a-m] tests
-    - script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/c[n-o].*")
+    - script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/c[n-o].*")
       os: linux
       dist: bionic
       go: 1.14.x
       env:
         - GO111MODULE=auto
       name: C-[n-o] tests
-    - script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/c[p-z].*")
+    - script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/c[p-z].*")
       os: linux
       dist: bionic
       go: 1.14.x
       env:
         - GO111MODULE=auto
       name: C-[p-z] tests
-    - script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[d-i].*")
+    - script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[d-i].*")
       os: linux
       dist: bionic
       go: 1.14.x
       env:
         - GO111MODULE=auto
       name: D-I tests
-    - script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[j-n].*")
+    - script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[j-n].*")
       os: linux
       dist: bionic
       go: 1.14.x
       env:
         - GO111MODULE=auto
       name: J-N tests
-    - script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[o-r].*")
+    - script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[o-r].*")
       os: linux
       dist: bionic
       go: 1.14.x
       env:
         - GO111MODULE=auto
       name: O-R tests
-    - script: go run build/ci.go test -v -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/s.*")
+    - script: travis_retry go run build/ci.go test -v -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/s.*")
       os: linux
       dist: bionic
       go: 1.14.x
       env:
         - GO111MODULE=auto
       name: S tests
-    - script: go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[t-z].*")
+    - script: travis_retry go run build/ci.go test -coverage $(go list ./... | grep "github.com\/ethereum\/go-ethereum\/[t-z].*")
       os: linux
       dist: bionic
       go: 1.14.x
diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go
index d3ec52674d..d7473cfcc8 100644
--- a/p2p/simulations/network_test.go
+++ b/p2p/simulations/network_test.go
@@ -284,7 +284,6 @@ OUTER_TWO:
 // connected in a ring topology, checks that all nodes successfully handshake
 // with each other and that a snapshot fully represents the desired topology
 func TestNetworkSimulation(t *testing.T) {
-	t.Skip("Test flaky")
 	// create simulation network with 20 testService nodes
 	adapter := adapters.NewSimAdapter(adapters.Services{
 		"test": newTestService,