diff --git a/.github/workflows/no-std.yaml b/.github/workflows/no-std.yaml
index 3bd678a29..af18ad797 100644
--- a/.github/workflows/no-std.yaml
+++ b/.github/workflows/no-std.yaml
@@ -18,16 +18,18 @@ jobs:
           cd tools/no-std-check
           make check-panic-conflict
 
-  check-substrate:
-    name: Check no_std substrate support
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          target: wasm32-unknown-unknown
-          override: true
-      - run: |
-          cd tools/no-std-check
-          make check-substrate
+  # Disabled until sp-io removes this feature which was removed in latest nightlies:
+  #   https://github.com/paritytech/substrate/blob/b5846ccc8480806aa6035ae4d2e89d61930f697e/primitives/io/src/lib.rs#L22
+  # check-substrate:
+  #   name: Check no_std substrate support
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions-rs/toolchain@v1
+  #       with:
+  #         toolchain: nightly
+  #         target: wasm32-unknown-unknown
+  #         override: true
+  #     - run: |
+  #         cd tools/no-std-check
+  #         make check-substrate
diff --git a/tools/kvstore-test/Cargo.toml b/tools/kvstore-test/Cargo.toml
index 2f1404630..ee1b566ad 100644
--- a/tools/kvstore-test/Cargo.toml
+++ b/tools/kvstore-test/Cargo.toml
@@ -16,6 +16,6 @@ tendermint-light-client = { version = "0.31.1", path = "../../light-client", fea
 tendermint-rpc = { version = "0.31.1", path = "../../rpc", features = [ "http-client", "websocket-client" ] }
 tokio = { version = "1.0", features = [ "rt-multi-thread", "macros" ] }
 tracing = "0.1"
-tracing-subscriber = "0.2"
+tracing-subscriber = "0.3"
 contracts = "0.4.0"
 serde_json = "1"
diff --git a/tools/kvstore-test/Makefile.toml b/tools/kvstore-test/Makefile.toml
index d45c781e5..72abfe14a 100644
--- a/tools/kvstore-test/Makefile.toml
+++ b/tools/kvstore-test/Makefile.toml
@@ -18,7 +18,7 @@ args = ["run", "--name", "${CONTAINER_NAME}", "--rm", "--publish", "26657:${HOST
 dependencies = ["docker-up-stop-old", "docker-up-rm-old"]
 
 [tasks.test]
-args = ["test", "--all-features", "--", "--nocapture"]
+args = ["test", "--all-features", "--", "--nocapture", "--test-threads=1"]
 
 [tasks.docker-stop]
 command = "docker"