diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index 2e9e40b25c5c67..e50567d8e78fe2 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -17,7 +17,7 @@ steps:
   - command: "ci/docker-run.sh solanalabs/rust:1.31.0 ci/test-stable.sh"
     name: "stable"
     timeout_in_minutes: 30
-  - command: "ci/docker-run.sh solanalabs/rust-nightly:2018-12-05 ci/test-nightly.sh"
+  - command: "ci/docker-run.sh solanalabs/rust:1:31.0 ci/test-nightly.sh"
     name: "nightly"
     timeout_in_minutes: 30
   # TODO: Fix and re-enable test-large-network.sh
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index b3a3295ec04310..f6ac4a86da70c1 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -4,7 +4,7 @@ set -e
 cd "$(dirname "$0")/.."
 source ci/upload-ci-artifact.sh
 
-ci/version-check.sh nightly
+ci/version-check.sh stable
 export RUST_BACKTRACE=1
 
 _() {
@@ -53,16 +53,14 @@ _ cd target/cov && tar -cjf lcov-report.tar.bz2 report-lcov/* && cd -
 _ upload-ci-artifact "target/cov/lcov-report.tar.bz2"
 
 # Upload coverage files to buildkite for grcov debugging
-_ cd target/cov/build && tar -cjf cov-gcda.tar.bz2 gcda/* && cd -
-_ upload-ci-artifact "target/cov/build/cov-gcda.tar.bz2"
-
-_ cd target/cov/build && tar -cjf cov-gcno.tar.bz2 gcno/* && cd -
-_ upload-ci-artifact "target/cov/build/cov-gcno.tar.bz2"
+#_ cd target/cov/build && tar -cjf cov-gcda.tar.bz2 gcda/* && cd -
+#_ upload-ci-artifact "target/cov/build/cov-gcda.tar.bz2"
+#
+#_ cd target/cov/build && tar -cjf cov-gcno.tar.bz2 gcno/* && cd -
+#_ upload-ci-artifact "target/cov/build/cov-gcno.tar.bz2"
 
 if [[ -z "$CODECOV_TOKEN" ]]; then
   echo CODECOV_TOKEN undefined
 else
-  true
-  # TODO: Why doesn't codecov grok our lcov files?
-  #bash <(curl -s https://codecov.io/bash) -X gcov
+  bash <(curl -s https://codecov.io/bash) -X gcov
 fi