diff --git a/qa/rpc-tests/test_script_address2.py b/qa/rpc-tests/test_script_address2.py
new file mode 100644
index 0000000000..fa8d176857
--- /dev/null
+++ b/qa/rpc-tests/test_script_address2.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 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 the CHECKLOCKTIMEVERIFY (BIP65) soft-fork logic
+#
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+import decimal
+
+class ScriptAddress2Test(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 3
+        self.setup_clean_chain = False
+
+    def setup_network(self):
+        self.nodes = []
+        self.nodes.append(start_node(0, self.options.tmpdir, []))
+        self.nodes.append(start_node(1, self.options.tmpdir, []))
+        self.nodes.append(start_node(2, self.options.tmpdir, []))
+        connect_nodes(self.nodes[1], 0)
+        connect_nodes(self.nodes[2], 0)
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        cnt = self.nodes[0].getblockcount()
+
+        # Mine some blocks
+        self.nodes[1].generate(100)
+        self.sync_all()
+        if (self.nodes[0].getblockcount() != cnt + 100):
+            raise AssertionError("Failed to mine 100 blocks")
+
+        addr = self.nodes[0].getnewaddress()
+        addr2 = self.nodes[0].getnewaddress()
+        multisig_addr = self.nodes[0].addmultisigaddress(2, [addr, addr2], "multisigaccount")
+        assert_equal(multisig_addr[0], 'Q')
+
+        # Send to a new multisig address
+        txid = self.nodes[1].sendtoaddress(multisig_addr, 1)
+        block = self.nodes[1].generate(3)
+        self.sync_all()
+        tx = self.nodes[2].getrawtransaction(txid, 1)
+        dest_addrs = [tx["vout"][0]['scriptPubKey']['addresses'][0],
+                      tx["vout"][1]['scriptPubKey']['addresses'][0]]
+        assert(multisig_addr in dest_addrs)
+
+        # Spend from the new multisig address
+        addr3 = self.nodes[1].getnewaddress()
+        txid = self.nodes[0].sendfrom("multisigaccount", addr3, 0.8)
+        block = self.nodes[0].generate(2)
+        self.sync_all()
+        assert(self.nodes[0].getbalance("multisigaccount", 1) < 0.2)
+        assert(self.nodes[1].listtransactions()[-1]['address'] == addr3)
+
+        # Send to an old multisig address. The api addmultisigaddress
+        # can only generate a new address so we manually compute
+        # multisig_addr_old beforehand using an old client.
+        priv_keys = ["cU7eeLPKzXeKMeZvnEJhvZZ3tLqVF3XGeo1BbM8dnbmV7pP3Qg89",
+                     "cTw7mRhSvTfzqCt6MFgBoTBqwBpYu2rWugisXcwjv4cAASh3iqPt"]
+
+        addrs = ["mj6gNGRXPXrD69R5ApjcsDerZGrYKSfb6v",
+                 "mqET4JA3L7P7FoUjUP3F6m6YsLpCkyzzou"]
+
+        self.nodes[0].importprivkey(priv_keys[0])
+        self.nodes[0].importprivkey(priv_keys[1])
+
+        multisig_addr_new = self.nodes[0].addmultisigaddress(2, addrs, "multisigaccount2")
+        assert_equal(multisig_addr_new, "QZ974ZrPrmqMmm1PSVp4m8YEgo3bCQZBbe")
+        multisig_addr_old = "2N5nLwYz9qfnGdaFLpPn3gS6oYQbmLTWPjq"
+        
+        ## Let's send to the old address. We can then find it in the
+        ## new address with the new client. So basically the old
+        ## address and the new one are the same thing.
+        txid = self.nodes[1].sendtoaddress(multisig_addr_old, 1)
+        block = self.nodes[1].generate(1)
+        self.sync_all()
+        tx = self.nodes[2].getrawtransaction(txid, 1)
+        dest_addrs = [tx["vout"][0]['scriptPubKey']['addresses'][0],
+                      tx["vout"][1]['scriptPubKey']['addresses'][0]]
+        assert(multisig_addr_new in dest_addrs)
+        assert(multisig_addr_old not in dest_addrs)
+
+        # Spend from the new multisig address
+        addr4 = self.nodes[1].getnewaddress()
+        txid = self.nodes[0].sendfrom("multisigaccount2", addr4, 0.8)
+        block = self.nodes[0].generate(2)
+        self.sync_all()
+        assert(self.nodes[0].getbalance("multisigaccount2", 1) < 0.2)
+        assert(self.nodes[1].listtransactions()[-1]['address'] == addr4)
+
+
+
+if __name__ == '__main__':
+    ScriptAddress2Test().main()