diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index c60018e14969c..d94955f722605 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -75,4 +75,4 @@ runtime-benchmarks = [
 ]
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
-try-runtime = ["node-template-runtime/try-runtime", "try-runtime-cli"]
+try-runtime = ["node-template-runtime/try-runtime", "try-runtime-cli/try-runtime"]
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 45ab4939e311c..139264657f89d 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -99,7 +99,7 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-try-runtime",
+	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-system/try-runtime",
 	"frame-support/try-runtime",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 4bf991f49320c..07208abdd089b 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -165,7 +165,7 @@ runtime-benchmarks = [
 ]
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
-try-runtime = ["kitchensink-runtime/try-runtime", "try-runtime-cli"]
+try-runtime = ["kitchensink-runtime/try-runtime", "try-runtime-cli/try-runtime"]
 
 [[bench]]
 name = "transaction_pool"
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 6940e968e28e7..39364961d57e2 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -254,7 +254,7 @@ runtime-benchmarks = [
 	"frame-system-benchmarking/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-try-runtime",
+	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-system/try-runtime",
 	"frame-support/try-runtime",
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index cd5c793ee2ee0..f6f5175d63bb9 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -49,4 +49,4 @@ std = [
 	"sp-std/std",
 	"sp-tracing/std",
 ]
-try-runtime = ["frame-support/try-runtime", "frame-try-runtime" ]
+try-runtime = ["frame-support/try-runtime", "frame-try-runtime/try-runtime" ]
diff --git a/frame/support/procedural/src/pallet/expand/genesis_build.rs b/frame/support/procedural/src/pallet/expand/genesis_build.rs
index 53d0695e5f971..d19476779011b 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_build.rs
@@ -19,7 +19,7 @@ use crate::pallet::Def;
 
 ///
 /// * implement the trait `sp_runtime::BuildModuleGenesisStorage`
-/// * add #[cfg(features = "std")] to GenesisBuild implementation.
+/// * add #[cfg(feature = "std")] to GenesisBuild implementation.
 pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
 	let genesis_config = if let Some(genesis_config) = &def.genesis_config {
 		genesis_config
diff --git a/frame/try-runtime/Cargo.toml b/frame/try-runtime/Cargo.toml
index dd77c0438d71f..51b6f91784594 100644
--- a/frame/try-runtime/Cargo.toml
+++ b/frame/try-runtime/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
-frame-support = { version = "4.0.0-dev", default-features = false, features = [ "try-runtime" ],  path = "../support" }
+frame-support = { version = "4.0.0-dev", default-features = false,  path = "../support" }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../primitives/api" }
 sp-runtime = { version = "6.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
@@ -28,3 +28,6 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+try-runtime = [
+	"frame-support/try-runtime",
+]
diff --git a/frame/try-runtime/src/lib.rs b/frame/try-runtime/src/lib.rs
index 7fec92712cd19..ed1247bd8e6f2 100644
--- a/frame/try-runtime/src/lib.rs
+++ b/frame/try-runtime/src/lib.rs
@@ -18,6 +18,7 @@
 //! Supporting types for try-runtime, testing and dry-running commands.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+#![cfg(feature = "try-runtime")]
 
 pub use frame_support::traits::TryStateSelect;
 use frame_support::weights::Weight;
diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml
index 3166e13313f2a..878c46f32e850 100644
--- a/scripts/ci/gitlab/pipeline/check.yml
+++ b/scripts/ci/gitlab/pipeline/check.yml
@@ -35,6 +35,19 @@ test-dependency-rules:
   script:
     - ./scripts/ci/gitlab/ensure-deps.sh
 
+test-rust-features:
+  stage:                           check
+  extends:
+    - .kubernetes-env
+    - .test-refs-no-trigger-prs-only
+  allow_failure:                   true
+  script:
+    - git clone
+        --depth=1
+        --branch="$PIPELINE_SCRIPTS_TAG"
+        https://github.com/paritytech/pipeline-scripts
+    - bash ./pipeline-scripts/rust-features.sh .
+
 test-prometheus-alerting-rules:
   stage:                           check
   extends:                         .kubernetes-env
@@ -51,4 +64,3 @@ test-prometheus-alerting-rules:
     - promtool check rules ./scripts/ci/monitoring/alerting-rules/alerting-rules.yaml
     - cat ./scripts/ci/monitoring/alerting-rules/alerting-rules.yaml |
         promtool test rules ./scripts/ci/monitoring/alerting-rules/alerting-rule-tests.yaml
-
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
index 24d64d4aa4373..c7191b7eb7f5f 100644
--- a/utils/frame/try-runtime/cli/Cargo.toml
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -31,8 +31,13 @@ sp-runtime = { version = "6.0.0", path = "../../../../primitives/runtime" }
 sp-state-machine = { version = "0.12.0", path = "../../../../primitives/state-machine" }
 sp-version = { version = "5.0.0", path = "../../../../primitives/version" }
 sp-weights = { version = "4.0.0", path = "../../../../primitives/weights" }
-frame-try-runtime = { path = "../../../../frame/try-runtime" }
+frame-try-runtime = { optional = true, path = "../../../../frame/try-runtime" }
 substrate-rpc-client = { path = "../../rpc/client" }
 
 [dev-dependencies]
 tokio = "1.17.0"
+
+[features]
+try-runtime = [
+	"frame-try-runtime/try-runtime",
+]
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 0732c8618fc15..f54354342bf28 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -265,6 +265,8 @@
 //!     -s snap \
 //! ```
 
+#![cfg(feature = "try-runtime")]
+
 use parity_scale_codec::Decode;
 use remote_externalities::{
 	Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig, TestExternalities,