diff --git a/packages/stargate/src/multisignature.spec.ts b/packages/stargate/src/multisignature.spec.ts
index d6859597..2ffacf99 100644
--- a/packages/stargate/src/multisignature.spec.ts
+++ b/packages/stargate/src/multisignature.spec.ts
@@ -1,5 +1,11 @@
-import { createMultisigThresholdPubkey, encodeSecp256k1Pubkey, pubkeyToAddress } from "@cosmjs/amino";
-import { coins, makeCosmoshubPath, Secp256k1HdWallet } from "@cosmjs/launchpad";
+import {
+  createMultisigThresholdPubkey,
+  encodeSecp256k1Pubkey,
+  makeCosmoshubPath,
+  pubkeyToAddress,
+  Secp256k1HdWallet,
+} from "@cosmjs/amino";
+import { coins } from "@cosmjs/launchpad";
 import { assert } from "@cosmjs/utils";
 
 import { MsgSend } from "./codec/cosmos/bank/v1beta1/tx";
diff --git a/packages/stargate/src/signingstargateclient.spec.ts b/packages/stargate/src/signingstargateclient.spec.ts
index e826c554..9a2c96af 100644
--- a/packages/stargate/src/signingstargateclient.spec.ts
+++ b/packages/stargate/src/signingstargateclient.spec.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention,no-bitwise */
-import { MsgDelegate as LaunchpadMsgDelegate, Secp256k1HdWallet } from "@cosmjs/launchpad";
+import { Secp256k1HdWallet } from "@cosmjs/amino";
+import { MsgDelegate as LaunchpadMsgDelegate } from "@cosmjs/launchpad";
 import { coin, coins, DirectSecp256k1HdWallet, Registry } from "@cosmjs/proto-signing";
 import { assert, sleep } from "@cosmjs/utils";
 import protobuf from "protobufjs/minimal";
diff --git a/packages/stargate/src/testutils.spec.ts b/packages/stargate/src/testutils.spec.ts
index 73d05d63..955345be 100644
--- a/packages/stargate/src/testutils.spec.ts
+++ b/packages/stargate/src/testutils.spec.ts
@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { AminoSignResponse, StdSignDoc } from "@cosmjs/amino";
+import { AminoSignResponse, Secp256k1HdWallet, StdSignDoc } from "@cosmjs/amino";
 import { Bip39, EnglishMnemonic, Random, Secp256k1, Slip10, Slip10Curve } from "@cosmjs/crypto";
 import { Bech32 } from "@cosmjs/encoding";
-import { Secp256k1HdWallet } from "@cosmjs/launchpad";
 import {
   coins,
   DirectSecp256k1HdWallet,