diff --git a/.travis.yml b/.travis.yml
index 040523096e323..d25e1588ad268 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 # Request an environment that provides sudo (that goes with larger containers)
 # and a minimal language environment.
 sudo: true
-language: minimal
+language: rust
 
 cache: cargo
 
@@ -13,13 +13,18 @@ env:
   global:
     - RUST_BACKTRACE=1
   matrix:
-    - RUST_TOOLCHAIN=nightly TARGET=wasm
-    - RUST_TOOLCHAIN=stable TARGET=native
+    - rust: stable
+      env: TARGET=native
+    - rust: nightly
+      env: TARGET=wasm
 
 before_install:
-  # Check how much space we've got on this machine.
+    # Check how much space we've got on this machine.
   - df -h
 
+install:
+  - travis_wait 30 cargo update --locked
+
 script:
   - ./ci/script.sh
 
diff --git a/ci/script.sh b/ci/script.sh
index 812da2d816805..aef9de36a42eb 100755
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -2,16 +2,6 @@
 
 set -eux
 
-# Install rustup and the specified rust toolchain.
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=$RUST_TOOLCHAIN -y
-
-# Load cargo environment. Specifically, put cargo into PATH.
-source ~/.cargo/env
-
-rustc --version
-rustup --version
-cargo --version
-
 case $TARGET in
 	"native")
 		sudo apt-get -y update
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index 52805843aa7db..4a107cf1cea9a 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -9,7 +9,7 @@ log = "0.3"
 kvdb = { git = "https://github.com/paritytech/parity.git" }
 kvdb-rocksdb = { git = "https://github.com/paritytech/parity.git" }
 ethereum-types = "0.3"
-hashdb = { git = "https://github.com/paritytech/parity.git" }
+hashdb = "0.2.0"
 patricia-trie = { git = "https://github.com/paritytech/parity.git" }
 memorydb = { git = "https://github.com/paritytech/parity.git" }
 substrate-primitives = { path = "../../../substrate/primitives" }
diff --git a/substrate/state-machine/Cargo.toml b/substrate/state-machine/Cargo.toml
index 17b072c4c6687..5937bec46a93e 100644
--- a/substrate/state-machine/Cargo.toml
+++ b/substrate/state-machine/Cargo.toml
@@ -14,6 +14,6 @@ triehash = "0.1"
 
 substrate-primitives = { path = "../primitives", version = "0.1.0" }
 
-hashdb = { git = "https://github.com/paritytech/parity.git" }
+hashdb = "0.2.0"
 memorydb = { git = "https://github.com/paritytech/parity.git" }
 patricia-trie = { git = "https://github.com/paritytech/parity.git" }