diff --git a/.gitignore b/.gitignore
index de8f91229..1b8b17bb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /coverage.txt
 /c2go
 /.vscode
+*.coverprofile
diff --git a/.travis.yml b/.travis.yml
index 5122c31fc..96983acc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,8 @@ script:
       # covermode be set to "count" so that the coverage profiles can be merged
       # correctly together with gocovmerge.
       rm -f /tmp/out.txt
-      go list -f "{{if or (len .TestGoFiles) (len .XTestGoFiles)}}go test -v -tags=integration -race -covermode count -coverprofile {{.Name}}_{{len .Imports}}_{{len .Deps}}.coverprofile -coverpkg $PKGS_DELIM {{.ImportPath}}{{end}} >> /tmp/out.txt" $PKGS | xargs -I {} bash -c {}
+      go list -f 'go test -v -tags=integration -race -covermode count -coverprofile {{.Name}}.coverprofile -coverpkg $PKGS_DELIM {{.ImportPath}}' $PKGS |
+        xargs -I{} bash -c '{} >> /tmp/out.txt'
       if [ $? -ne 0 ]; then
         # Print out the failures (removing a lot of the noise).
         cat /tmp/out.txt | grep -v -- "--- PASS" | grep -v -- "=== RUN"