diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -403,6 +403,7 @@
 	config.cpp
 	consensus/activation.cpp
 	consensus/tx_verify.cpp
+	dbwrapper.cpp
 	flatfile.cpp
 	globals.cpp
 	httprpc.cpp
@@ -412,12 +413,12 @@
 	init.cpp
 	interfaces/handler.cpp
 	interfaces/node.cpp
-	dbwrapper.cpp
 	merkleblock.cpp
 	miner.cpp
 	net.cpp
 	net_processing.cpp
 	noui.cpp
+	outputtype.cpp
 	policy/fees.cpp
 	policy/policy.cpp
 	pow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,6 +165,7 @@
   netbase.h \
   netmessagemaker.h \
   noui.h \
+  outputtype.h \
   policy/fees.h \
   policy/policy.h \
   pow.h \
@@ -272,6 +273,7 @@
   net.cpp \
   net_processing.cpp \
   noui.cpp \
+  outputtype.cpp \
   policy/fees.cpp \
   policy/policy.cpp \
   pow.cpp \
diff --git a/src/outputtype.h b/src/outputtype.h
new file mode 100644
--- /dev/null
+++ b/src/outputtype.h
@@ -0,0 +1,47 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2017 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_OUTPUTTYPE_H
+#define BITCOIN_OUTPUTTYPE_H
+
+#include <keystore.h>
+#include <script/standard.h>
+
+#include <string>
+#include <vector>
+
+enum class OutputType {
+    LEGACY,
+
+    /**
+     * Special output type for change outputs only. Automatically choose type
+     * based on address type setting and the types other of non-change outputs.
+     */
+    CHANGE_AUTO,
+};
+
+bool ParseOutputType(const std::string &str, OutputType &output_type);
+const std::string &FormatOutputType(OutputType type);
+
+/**
+ * Get a destination of the requested type (if possible) to the specified key.
+ * The caller must make sure LearnRelatedScripts has been called beforehand.
+ */
+CTxDestination GetDestinationForKey(const CPubKey &key, OutputType);
+
+/**
+ * Get all destinations (potentially) supported by the wallet for the given key.
+ */
+std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey &key);
+
+/**
+ * Get a destination of the requested type (if possible) to the specified
+ * script. This function will automatically add the script (and any other
+ * necessary scripts) to the keystore.
+ */
+CTxDestination AddAndGetDestinationForScript(CKeyStore &keystore,
+                                             const CScript &script, OutputType);
+
+#endif // BITCOIN_OUTPUTTYPE_H
diff --git a/src/outputtype.cpp b/src/outputtype.cpp
new file mode 100644
--- /dev/null
+++ b/src/outputtype.cpp
@@ -0,0 +1,60 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2017 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <outputtype.h>
+
+#include <keystore.h>
+#include <pubkey.h>
+#include <script/script.h>
+#include <script/standard.h>
+
+#include <cassert>
+#include <string>
+
+static const std::string OUTPUT_TYPE_STRING_LEGACY = "legacy";
+
+bool ParseOutputType(const std::string &type, OutputType &output_type) {
+    if (type == OUTPUT_TYPE_STRING_LEGACY) {
+        output_type = OutputType::LEGACY;
+        return true;
+    }
+    return false;
+}
+
+const std::string &FormatOutputType(OutputType type) {
+    switch (type) {
+        case OutputType::LEGACY:
+            return OUTPUT_TYPE_STRING_LEGACY;
+        default:
+            assert(false);
+    }
+}
+
+CTxDestination GetDestinationForKey(const CPubKey &key, OutputType type) {
+    switch (type) {
+        case OutputType::LEGACY:
+            return key.GetID();
+        default:
+            assert(false);
+    }
+}
+
+std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey &key) {
+    return std::vector<CTxDestination>{key.GetID()};
+}
+
+CTxDestination AddAndGetDestinationForScript(CKeyStore &keystore,
+                                             const CScript &script,
+                                             OutputType type) {
+    // Add script to keystore
+    keystore.AddCScript(script);
+    // Note that scripts over 520 bytes are not yet supported.
+    switch (type) {
+        case OutputType::LEGACY:
+            return CScriptID(script);
+        default:
+            assert(false);
+    }
+}
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -13,6 +13,7 @@
 #include <logging.h>
 #include <net.h>
 #include <netbase.h>
+#include <outputtype.h>
 #include <rpc/blockchain.h>
 #include <rpc/misc.h>
 #include <rpc/server.h>
@@ -151,12 +152,17 @@
         }
     }
 
+    // Get the output type
+    OutputType output_type = OutputType::LEGACY;
+
     // Construct using pay-to-script-hash:
-    CScript inner = CreateMultisigRedeemscript(required, pubkeys);
-    CScriptID innerID(inner);
+    const CScript inner = CreateMultisigRedeemscript(required, pubkeys);
+    CBasicKeyStore keystore;
+    const CTxDestination dest =
+        AddAndGetDestinationForScript(keystore, inner, output_type);
 
     UniValue result(UniValue::VOBJ);
-    result.pushKV("address", EncodeDestination(innerID, config));
+    result.pushKV("address", EncodeDestination(dest, config));
     result.pushKV("redeemScript", HexStr(inner.begin(), inner.end()));
 
     return result;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -11,6 +11,7 @@
 #include <core_io.h>
 #include <key_io.h>
 #include <net.h>
+#include <outputtype.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
 #include <rpc/mining.h>
@@ -1704,11 +1705,8 @@
 
     // Construct using pay-to-script-hash:
     CScript inner = CreateMultisigRedeemscript(required, pubkeys);
-    pwallet->AddCScript(inner);
-
     CTxDestination dest =
-        pwallet->AddAndGetDestinationForScript(inner, output_type);
-
+        AddAndGetDestinationForScript(*pwallet, inner, output_type);
     pwallet->SetAddressBook(dest, label, "send");
 
     UniValue result(UniValue::VOBJ);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -8,6 +8,7 @@
 #define BITCOIN_WALLET_WALLET_H
 
 #include <amount.h>
+#include <outputtype.h>
 #include <script/ismine.h>
 #include <script/sign.h>
 #include <streams.h>
@@ -91,18 +92,6 @@
     FEATURE_LATEST = FEATURE_PRE_SPLIT_KEYPOOL,
 };
 
-enum class OutputType {
-    LEGACY,
-
-    /**
-     * Special output type for change outputs only. Automatically choose type
-     * based on address type setting and the types other of non-change outputs
-     * (see -changetype option documentation and implementation in
-     * CWallet::TransactionChangeType for details).
-     */
-    CHANGE_AUTO,
-};
-
 //! Default for -addresstype
 constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::LEGACY};
 
@@ -1343,14 +1332,6 @@
      * could be anything).
      */
     void LearnAllRelatedScripts(const CPubKey &key);
-
-    /**
-     * Get a destination of the requested type (if possible) to the specified
-     * script. This function will automatically add the necessary scripts to the
-     * wallet.
-     */
-    CTxDestination AddAndGetDestinationForScript(const CScript &script,
-                                                 OutputType);
 };
 
 /** A key allocated from the key pool. */
@@ -1400,20 +1381,6 @@
     }
 };
 
-bool ParseOutputType(const std::string &str, OutputType &output_type);
-const std::string &FormatOutputType(OutputType type);
-
-/**
- * Get a destination of the requested type (if possible) to the specified key.
- * The caller must make sure LearnRelatedScripts has been called beforehand.
- */
-CTxDestination GetDestinationForKey(const CPubKey &key, OutputType);
-
-/**
- * Get all destinations (potentially) supported by the wallet for the given key.
- */
-std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey &key);
-
 /** RAII object to check and reserve a wallet rescan */
 class WalletRescanReserver {
 private:
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -4778,25 +4778,6 @@
     return ret;
 }
 
-static const std::string OUTPUT_TYPE_STRING_LEGACY = "legacy";
-
-bool ParseOutputType(const std::string &type, OutputType &output_type) {
-    if (type == OUTPUT_TYPE_STRING_LEGACY) {
-        output_type = OutputType::LEGACY;
-        return true;
-    }
-    return false;
-}
-
-const std::string &FormatOutputType(OutputType type) {
-    switch (type) {
-        case OutputType::LEGACY:
-            return OUTPUT_TYPE_STRING_LEGACY;
-        default:
-            assert(false);
-    }
-}
-
 void CWallet::LearnRelatedScripts(const CPubKey &key, OutputType type) {
     // Nothing to do...
 }
@@ -4805,30 +4786,6 @@
     // Nothing to do...
 }
 
-CTxDestination GetDestinationForKey(const CPubKey &key, OutputType type) {
-    switch (type) {
-        case OutputType::LEGACY:
-            return key.GetID();
-        default:
-            assert(false);
-    }
-}
-
-std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey &key) {
-    return std::vector<CTxDestination>{key.GetID()};
-}
-
-CTxDestination CWallet::AddAndGetDestinationForScript(const CScript &script,
-                                                      OutputType type) {
-    // Note that scripts over 520 bytes are not yet supported.
-    switch (type) {
-        case OutputType::LEGACY:
-            return CScriptID(script);
-        default:
-            assert(false);
-    }
-}
-
 std::vector<OutputGroup>
 CWallet::GroupOutputs(const std::vector<COutput> &outputs,
                       bool single_coin) const {
diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py
new file mode 100755
--- /dev/null
+++ b/test/functional/rpc_createmultisig.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2017 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test transaction signing using the signrawtransaction* RPCs."""
+
+from test_framework.test_framework import BitcoinTestFramework
+import decimal
+
+
+class RpcCreateMultiSigTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.setup_clean_chain = True
+        self.num_nodes = 3
+
+    def get_keys(self):
+        node0, node1, node2 = self.nodes
+        self.add = [node1.getnewaddress() for _ in range(self.nkeys)]
+        self.pub = [node1.getaddressinfo(a)["pubkey"] for a in self.add]
+        self.priv = [node1.dumpprivkey(a) for a in self.add]
+        self.final = node2.getnewaddress()
+
+    def run_test(self):
+        node0, node1, node2 = self.nodes
+
+        # 50 BCH each, rest will be 25 BCH each
+        node0.generate(149)
+        self.sync_all()
+
+        self.moved = 0
+        for self.nkeys in [3, 5]:
+            for self.nsigs in [2, 3]:
+                self.get_keys()
+                self.do_multisig()
+
+        self.checkbalances()
+
+    def checkbalances(self):
+        node0, node1, node2 = self.nodes
+        node0.generate(100)
+        self.sync_all()
+
+        bal0 = node0.getbalance()
+        bal1 = node1.getbalance()
+        bal2 = node2.getbalance()
+
+        height = node0.getblockchaininfo()["blocks"]
+        assert 150 < height < 350
+        total = 149 * 50 + (height - 149 - 100) * 25
+        assert bal1 == 0
+        assert bal2 == self.moved
+        assert bal0 + bal1 + bal2 == total
+
+    def do_multisig(self):
+        node0, node1, node2 = self.nodes
+
+        msig = node2.createmultisig(self.nsigs, self.pub)
+        madd = msig["address"]
+        mredeem = msig["redeemScript"]
+
+        # compare against addmultisigaddress
+        msigw = node1.addmultisigaddress(self.nsigs, self.pub, None)
+        maddw = msigw["address"]
+        mredeemw = msigw["redeemScript"]
+        # addmultisigiaddress and createmultisig work the same
+        assert maddw == madd
+        assert mredeemw == mredeem
+
+        txid = node0.sendtoaddress(madd, 40)
+
+        tx = node0.getrawtransaction(txid, True)
+        vout = [v["n"] for v in tx["vout"]
+                if madd in v["scriptPubKey"].get("addresses", [])]
+        assert len(vout) == 1
+        vout = vout[0]
+        scriptPubKey = tx["vout"][vout]["scriptPubKey"]["hex"]
+        value = tx["vout"][vout]["value"]
+        prevtxs = [{"txid": txid, "vout": vout, "scriptPubKey": scriptPubKey,
+                    "redeemScript": mredeem, "amount": value}]
+
+        node0.generate(1)
+
+        outval = value - decimal.Decimal("0.00001000")
+        rawtx = node2.createrawtransaction(
+            [{"txid": txid, "vout": vout}], [{self.final: outval}])
+
+        rawtx2 = node2.signrawtransactionwithkey(
+            rawtx, self.priv[0:self.nsigs-1], prevtxs)
+        rawtx3 = node2.signrawtransactionwithkey(
+            rawtx2["hex"], [self.priv[-1]], prevtxs)
+
+        self.moved += outval
+        tx = node0.sendrawtransaction(rawtx3["hex"], True)
+        blk = node0.generate(1)[0]
+        assert tx in node0.getblock(blk)["tx"]
+
+        txinfo = node0.getrawtransaction(tx, True, blk)
+        self.log.info("n/m={}/{} size={}".format(self.nsigs,
+                                                 self.nkeys, txinfo["size"]))
+
+
+if __name__ == '__main__':
+    RpcCreateMultiSigTest().main()