diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2802682..7bf4d8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,17 +16,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install nightly toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
+        uses: dtolnay/rust-toolchain@nightly
 
       - name: Run cargo check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --all-features
+        run: cargo check --all-features
 
   test:
     name: Test Suite
@@ -39,17 +32,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install nightly toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
+        uses: dtolnay/rust-toolchain@nightly
 
       - name: Run cargo test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features -- --test-threads=1
+        run: cargo test --all-features -- --test-threads=1
 
 ## Currently disabled because internal version of rustfmt produces different
 ## formatting.
@@ -61,18 +47,12 @@ jobs:
 #        uses: actions/checkout@v2
 #
 #      - name: Install nightly toolchain
-#        uses: actions-rs/toolchain@v1
+#        uses: dtolnay/rust-toolchain@nightly
 #        with:
-#          profile: minimal
-#          toolchain: nightly
-#          override: true
 #          components: rustfmt
 #
 #      - name: Run cargo fmt
-#        uses: actions-rs/cargo@v1
-#        with:
-#          command: fmt
-#          args: --all -- --check
+#        run: cargo fmt --all -- --check
 
   clippy:
     name: Clippy
@@ -82,12 +62,8 @@ jobs:
         run: sudo apt-get install -y libunwind-dev
 
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@nightly
         with:
-            toolchain: nightly
             components: clippy
-            override: true
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
+      - name: Run cargo clippy
+        run: cargo clippy all-features -- -Dclippy::all