diff --git a/.travis.yml b/.travis.yml
index bcb47695596..ab592496894 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,10 @@ notifications:
   email: false
 
 after_success:
-  - julia --project=coverage/ -e 'using Pkg; Pkg.instantiate()'
-  - julia --project=coverage/ coverage/coverage.jl
+  - if [[ $TRAVIS_JULIA_VERSION = 1.1 ]] && [[ $TRAVIS_OS_NAME = linux ]]; then
+      julia --project=coverage/ -e 'using Pkg; Pkg.instantiate();
+          using Coverage; Codecov.submit(Codecov.process_folder())';
+  fi
 
 jobs:
   include:
diff --git a/.codecov.yml b/coverage/.codecov.yml
similarity index 100%
rename from .codecov.yml
rename to coverage/.codecov.yml
diff --git a/coverage/coverage.jl b/coverage/coverage.jl
deleted file mode 100644
index c15a01cbbfc..00000000000
--- a/coverage/coverage.jl
+++ /dev/null
@@ -1,9 +0,0 @@
-# Only run coverage from linux nightly build on travis.
-get(ENV, "TRAVIS_OS_NAME", "")       == "linux"   || exit()
-get(ENV, "TRAVIS_JULIA_VERSION", "") == "nightly" || exit()
-
-using Coverage
-
-cd(joinpath(dirname(@__FILE__), "..")) do
-    Codecov.submit(Codecov.process_folder())
-end