diff --git a/x/wasm/genesis_test.go b/x/wasm/genesis_test.go
index 83d5db2004..d6050ba626 100644
--- a/x/wasm/genesis_test.go
+++ b/x/wasm/genesis_test.go
@@ -9,6 +9,7 @@ import (
 )
 
 func TestInitGenesis(t *testing.T) {
+	t.Helper()
 	data := setupTest(t)
 
 	deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
diff --git a/x/wasm/module.go b/x/wasm/module.go
index 992a3fbff9..6fc956289f 100644
--- a/x/wasm/module.go
+++ b/x/wasm/module.go
@@ -150,6 +150,7 @@ func (AppModule) ConsensusVersion() uint64 { return 3 }
 
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
+	types.RegisterQueryServer(cfg.QueryServer(), NewQuerier(am.keeper))
 
 	m := keeper.NewMigrator(*am.keeper, am.legacySubspace)
 	err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2)
diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go
index 32e78fe67d..116176d560 100644
--- a/x/wasm/module_test.go
+++ b/x/wasm/module_test.go
@@ -57,7 +57,7 @@ type testData struct {
 
 func setupTest(t *testing.T) testData {
 	t.Helper()
-	ctx, keepers := CreateTestInput(t, false, "iterator,staking,stargate,cosmwasm_1_1")
+	ctx, keepers := CreateTestInput(t, false, "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,token_factory")
 	encConf := keeper.MakeEncodingConfig(t)
 	queryRouter := baseapp.NewGRPCQueryRouter()
 	serviceRouter := baseapp.NewMsgServiceRouter()