diff --git a/Makefile b/Makefile
index 5bc7900fbfe..592588ba05e 100644
--- a/Makefile
+++ b/Makefile
@@ -114,9 +114,6 @@ test:
 	fi
 	bash scripts/check-bins-for-jemalloc.sh
 
-bench:
-	LOG_LEVEL=ERROR RUST_BACKTRACE=1 cargo bench --all --no-default-features --features "${ENABLE_FEATURES}" -- --nocapture
-
 unset-override:
 	@# unset first in case of any previous overrides
 	@if rustup override list | grep `pwd` > /dev/null; then rustup override unset; fi
diff --git a/src/raftstore/store/fsm/store.rs b/src/raftstore/store/fsm/store.rs
index b8d30082a26..454b156d782 100644
--- a/src/raftstore/store/fsm/store.rs
+++ b/src/raftstore/store/fsm/store.rs
@@ -30,9 +30,11 @@ use crate::raftstore::store::fsm::metrics::*;
 use crate::raftstore::store::fsm::peer::{
     maybe_destroy_source, new_admin_request, PeerFsm, PeerFsmDelegate,
 };
+#[cfg(not(feature = "no-fail"))]
+use crate::raftstore::store::fsm::ApplyTaskRes;
 use crate::raftstore::store::fsm::{
     batch, create_apply_batch_system, ApplyBatchSystem, ApplyPollerBuilder, ApplyRouter, ApplyTask,
-    ApplyTaskRes, BasicMailbox, BatchRouter, BatchSystem, HandlerBuilder,
+    BasicMailbox, BatchRouter, BatchSystem, HandlerBuilder,
 };
 use crate::raftstore::store::fsm::{ApplyNotifier, Fsm, PollHandler, RegionProposal};
 use crate::raftstore::store::keys::{self, data_end_key, data_key, enc_end_key, enc_start_key};
diff --git a/tests/failpoints/mod.rs b/tests/failpoints/mod.rs
index 40ecd951c71..5b2bf9152d5 100644
--- a/tests/failpoints/mod.rs
+++ b/tests/failpoints/mod.rs
@@ -5,8 +5,10 @@
 
 #[macro_use]
 extern crate lazy_static;
+#[cfg(not(feature = "no-fail"))]
 #[macro_use(slog_kv, slog_debug, slog_log, slog_record, slog_b, slog_record_static)]
 extern crate slog;
+#[cfg(not(feature = "no-fail"))]
 #[macro_use]
 extern crate slog_global;