diff --git a/Cargo.lock b/Cargo.lock
index 192ec4fa..696c1fc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -419,6 +419,7 @@ version = "2.2.0"
 dependencies = [
  "anyhow",
  "bech32",
+ "cosmwasm-schema",
  "cosmwasm-std",
  "cw-storage-plus",
  "cw-utils",
diff --git a/Cargo.toml b/Cargo.toml
index 0855f768..4b190537 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,6 +29,7 @@ cosmwasm_2_1 = ["cosmwasm_2_0", "cosmwasm-std/cosmwasm_2_1"]
 [dependencies]
 anyhow = "1.0.89"
 bech32 = "0.11.0"
+cosmwasm-schema = "2.1.3"
 cosmwasm-std = "2.1.4"
 cw-storage-plus = "2.0.0"
 cw-utils = "2.0.0"
diff --git a/src/test_helpers/echo.rs b/src/test_helpers/echo.rs
index 16ab2fbd..5da47d26 100644
--- a/src/test_helpers/echo.rs
+++ b/src/test_helpers/echo.rs
@@ -4,23 +4,23 @@
 //! Additionally, it bypasses all events and attributes send to it.
 
 use crate::{Contract, ContractWrapper};
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
     to_json_binary, Attribute, Binary, CustomMsg, Deps, DepsMut, Empty, Env, Event, MessageInfo,
     Reply, Response, StdError, SubMsg, SubMsgResponse, SubMsgResult,
 };
 use cw_utils::{parse_execute_response_data, parse_instantiate_response_data};
-use schemars::JsonSchema;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use std::fmt::Debug;
+use serde::de::DeserializeOwned;
 
 // Choosing a reply id less than ECHO_EXECUTE_BASE_ID indicates an Instantiate message reply by convention.
 // An Execute message reply otherwise.
 pub const EXECUTE_REPLY_BASE_ID: u64 = i64::MAX as u64;
 
-#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+#[cw_serde]
+#[derive(Default)]
 pub struct Message<ExecC>
 where
-    ExecC: Debug + PartialEq + Clone + JsonSchema + 'static,
+    ExecC: CustomMsg + 'static,
 {
     pub data: Option<String>,
     pub sub_msg: Vec<SubMsg<ExecC>>,
@@ -28,17 +28,16 @@ where
     pub events: Vec<Event>,
 }
 
-// This can take some data... but happy to accept {}
-#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+#[cw_serde]
+#[derive(Default)]
 pub struct InitMessage<ExecC>
 where
-    ExecC: Debug + PartialEq + Clone + JsonSchema + 'static,
+    ExecC: CustomMsg + 'static,
 {
     pub data: Option<String>,
     pub sub_msg: Option<Vec<SubMsg<ExecC>>>,
 }
 
-#[allow(clippy::unnecessary_wraps)]
 fn instantiate<ExecC>(
     _deps: DepsMut,
     _env: Env,
@@ -46,7 +45,7 @@ fn instantiate<ExecC>(
     msg: InitMessage<ExecC>,
 ) -> Result<Response<ExecC>, StdError>
 where
-    ExecC: Debug + PartialEq + Clone + JsonSchema + 'static,
+    ExecC: CustomMsg + 'static,
 {
     let mut res = Response::new();
     if let Some(data) = msg.data {
@@ -58,7 +57,6 @@ where
     Ok(res)
 }
 
-#[allow(clippy::unnecessary_wraps)]
 fn execute<ExecC>(
     _deps: DepsMut,
     _env: Env,
@@ -66,7 +64,7 @@ fn execute<ExecC>(
     msg: Message<ExecC>,
 ) -> Result<Response<ExecC>, StdError>
 where
-    ExecC: Debug + PartialEq + Clone + JsonSchema + 'static,
+    ExecC: CustomMsg + 'static,
 {
     let mut resp = Response::new();
 
@@ -84,12 +82,12 @@ fn query(_deps: Deps, _env: Env, msg: Empty) -> Result<Binary, StdError> {
     to_json_binary(&msg)
 }
 
-#[allow(clippy::unnecessary_wraps, deprecated)]
 fn reply<ExecC>(_deps: DepsMut, _env: Env, msg: Reply) -> Result<Response<ExecC>, StdError>
 where
-    ExecC: Debug + PartialEq + Clone + JsonSchema + 'static,
+    ExecC: CustomMsg + 'static,
 {
     let res = Response::new();
+    #[allow(deprecated)]
     if let Reply {
         id,
         result: SubMsgResult::Ok(SubMsgResponse {
diff --git a/src/test_helpers/hackatom.rs b/src/test_helpers/hackatom.rs
index 95df71ba..6c0d7dd6 100644
--- a/src/test_helpers/hackatom.rs
+++ b/src/test_helpers/hackatom.rs
@@ -1,27 +1,25 @@
 //! Simplified contract which when executed releases the funds to beneficiary
 
 use crate::{Contract, ContractWrapper};
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
     to_json_binary, BankMsg, Binary, CustomMsg, Deps, DepsMut, Empty, Env, MessageInfo, Response,
     StdError,
 };
 use cw_storage_plus::Item;
-use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cw_serde]
 pub struct InstantiateMsg {
     pub beneficiary: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cw_serde]
 pub struct MigrateMsg {
     // just use some other string, so we see there are other types
     pub new_guy: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
+#[cw_serde]
 pub enum QueryMsg {
     // returns InstantiateMsg
     Beneficiary {},
diff --git a/src/test_helpers/mod.rs b/src/test_helpers/mod.rs
index ac053fce..c99736c9 100644
--- a/src/test_helpers/mod.rs
+++ b/src/test_helpers/mod.rs
@@ -1,9 +1,8 @@
 #![cfg(test)]
 
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::CustomMsg;
 use cw_storage_plus::Item;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
 pub mod caller;
 pub mod echo;
@@ -19,7 +18,8 @@ pub mod reflect;
 pub mod stargate;
 
 /// Custom message for testing purposes.
-#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[cw_serde]
+#[derive(Default)]
 #[serde(rename = "snake_case")]
 pub enum CustomHelperMsg {
     SetName {
diff --git a/src/test_helpers/payout.rs b/src/test_helpers/payout.rs
index 159f6cea..5d0eddb4 100644
--- a/src/test_helpers/payout.rs
+++ b/src/test_helpers/payout.rs
@@ -1,30 +1,29 @@
 use crate::test_helpers::COUNT;
 use crate::{Contract, ContractWrapper};
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
     to_json_binary, BankMsg, Binary, Coin, CustomMsg, Deps, DepsMut, Empty, Env, MessageInfo,
     Response, StdError,
 };
 use cw_storage_plus::Item;
-use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[cw_serde]
 pub struct InstantiateMessage {
     pub payout: Coin,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[cw_serde]
 pub struct SudoMsg {
     pub set_count: u32,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cw_serde]
 pub enum QueryMsg {
     Count {},
     Payout {},
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[cw_serde]
 pub struct CountResponse {
     pub count: u32,
 }
diff --git a/src/test_helpers/reflect.rs b/src/test_helpers/reflect.rs
index 41b4396e..2bfb59ab 100644
--- a/src/test_helpers/reflect.rs
+++ b/src/test_helpers/reflect.rs
@@ -1,18 +1,18 @@
 use crate::test_helpers::{payout, CustomHelperMsg, COUNT};
 use crate::{Contract, ContractWrapper};
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
     to_json_binary, Binary, Deps, DepsMut, Empty, Env, Event, MessageInfo, Reply, Response,
     StdError, SubMsg,
 };
 use cw_storage_plus::Map;
-use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[cw_serde]
 pub struct Message {
     pub messages: Vec<SubMsg<CustomHelperMsg>>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cw_serde]
 pub enum QueryMsg {
     Count {},
     Reply { id: u64 },
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
index 39470562..2f5d2092 100644
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -3,9 +3,6 @@
 mod test_app;
 mod test_custom_handler;
 mod test_error;
-#[cfg(feature = "stargate")]
 mod test_gov;
-#[cfg(feature = "stargate")]
 mod test_ibc;
-#[cfg(feature = "stargate")]
 mod test_stargate;
diff --git a/src/tests/test_gov.rs b/src/tests/test_gov.rs
index 68897735..65d560a4 100644
--- a/src/tests/test_gov.rs
+++ b/src/tests/test_gov.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "stargate")]
+
 use crate::test_helpers::gov;
 use crate::{no_init, App, AppBuilder, Executor, GovAcceptingModule};
 use cosmwasm_std::Empty;
diff --git a/src/tests/test_ibc.rs b/src/tests/test_ibc.rs
index ab70567c..c3e7a756 100644
--- a/src/tests/test_ibc.rs
+++ b/src/tests/test_ibc.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "stargate")]
+
 use crate::test_helpers::ibc;
 use crate::{no_init, App, AppBuilder, Executor, IbcAcceptingModule};
 use cosmwasm_std::Empty;
diff --git a/src/tests/test_stargate.rs b/src/tests/test_stargate.rs
index 01f2f975..db00a5ab 100644
--- a/src/tests/test_stargate.rs
+++ b/src/tests/test_stargate.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "stargate")]
+
 use crate::test_helpers::stargate;
 use crate::{no_init, App, AppBuilder, Executor, StargateAccepting};
 use cosmwasm_std::Empty;
diff --git a/tests/mod.rs b/tests/mod.rs
index 6f5d40fe..c7e7a91b 100644
--- a/tests/mod.rs
+++ b/tests/mod.rs
@@ -15,23 +15,22 @@ mod test_wasm;
 mod test_contracts {
 
     pub mod counter {
+        use cosmwasm_schema::cw_serde;
         use cosmwasm_std::{
             to_json_binary, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response, StdError,
             WasmMsg,
         };
         use cw_multi_test::{Contract, ContractWrapper};
         use cw_storage_plus::Item;
-        use serde::{Deserialize, Serialize};
 
         const COUNTER: Item<u64> = Item::new("counter");
 
-        #[derive(Debug, Clone, Serialize, Deserialize)]
-        #[serde(rename_all = "snake_case")]
+        #[cw_serde]
         pub enum CounterQueryMsg {
             Counter {},
         }
 
-        #[derive(Debug, Clone, Serialize, Deserialize)]
+        #[cw_serde]
         pub struct CounterResponseMsg {
             pub value: u64,
         }
diff --git a/tests/test_bank/test_init_balance.rs b/tests/test_bank/test_init_balance.rs
index b312b22d..44fd0172 100644
--- a/tests/test_bank/test_init_balance.rs
+++ b/tests/test_bank/test_init_balance.rs
@@ -1,7 +1,6 @@
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Coin, CustomMsg, CustomQuery, Uint128};
 use cw_multi_test::{custom_app, App, AppBuilder, BasicApp};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
 const USER: &str = "user";
 const DENOM: &str = "denom";
@@ -52,15 +51,13 @@ fn initializing_balance_without_builder_should_work() {
 
 #[test]
 fn initializing_balance_custom_app_should_work() {
-    #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-    #[serde(rename = "snake_case")]
+    #[cw_serde]
     pub enum CustomHelperMsg {
         HelperMsg,
     }
     impl CustomMsg for CustomHelperMsg {}
 
-    #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-    #[serde(rename = "snake_case")]
+    #[cw_serde]
     pub enum CustomHelperQuery {
         HelperQuery,
     }