diff --git a/encoding.go b/encoding.go
index 120d1e74380c..0ceb12274342 100644
--- a/encoding.go
+++ b/encoding.go
@@ -8,9 +8,9 @@ import (
 // MakeEncodingConfig creates an EncodingConfig for testing
 func MakeEncodingConfig() params.EncodingConfig {
 	encodingConfig := params.MakeEncodingConfig()
-	std.RegisterCodec(encodingConfig.Amino)
+	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	ModuleBasics.RegisterCodec(encodingConfig.Amino)
+	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	return encodingConfig
 }
diff --git a/params/amino.go b/params/amino.go
index e5d540888769..67ee2d54da2c 100644
--- a/params/amino.go
+++ b/params/amino.go
@@ -10,7 +10,7 @@ import (
 
 // MakeEncodingConfig creates an EncodingConfig for an amino based test configuration.
 func MakeEncodingConfig() EncodingConfig {
-	cdc := codec.New()
+	cdc := codec.NewLegacyAmino()
 	interfaceRegistry := types.NewInterfaceRegistry()
 	marshaler := codec.NewAminoCodec(cdc)
 
diff --git a/params/proto.go b/params/proto.go
index 919ef949b669..20d3a3af9046 100644
--- a/params/proto.go
+++ b/params/proto.go
@@ -11,7 +11,7 @@ import (
 
 // MakeEncodingConfig creates an EncodingConfig for an amino based test configuration.
 func MakeEncodingConfig() EncodingConfig {
-	amino := codec.New()
+	amino := codec.NewLegacyAmino()
 	interfaceRegistry := types.NewInterfaceRegistry()
 	marshaler := codec.NewProtoCodec(interfaceRegistry)
 	txCfg := tx.NewTxConfig(marshaler, std.DefaultPublicKeyCodec{}, tx.DefaultSignModes)
diff --git a/utils_test.go b/utils_test.go
index 22e362480500..6d8bb21f3f08 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -15,10 +15,10 @@ import (
 )
 
 func makeCodec(bm module.BasicManager) *codec.LegacyAmino {
-	cdc := codec.New()
+	cdc := codec.NewLegacyAmino()
 
-	bm.RegisterCodec(cdc)
-	std.RegisterCodec(cdc)
+	bm.RegisterLegacyAminoCodec(cdc)
+	std.RegisterLegacyAminoCodec(cdc)
 
 	return cdc
 }