diff --git a/test/functional/disablewallet.py b/test/functional/disablewallet.py
index 96f08b6b2..bd11ab3c3 100755
--- a/test/functional/disablewallet.py
+++ b/test/functional/disablewallet.py
@@ -1,37 +1,39 @@
 #!/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 a node with the -disablewallet option.
 
-#
-# Exercise API with -disablewallet.
-#
+- Test that validateaddress RPC works when running with -disablewallet
+- Test that it is not possible to mine to an invalid address.
+"""
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
 
 class DisableWalletTest (BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
         self.extra_args = [["-disablewallet"]]
 
     def run_test(self):
-        # Check regression:
-        # https://github.com/bitcoin/bitcoin/issues/6963#issuecomment-154548880
+        # Make sure wallet is really disabled
+        assert_raises_rpc_error(-32601, 'Method not found',
+                                self.nodes[0].getwalletinfo)
         x = self.nodes[0].validateaddress('3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
         assert(x['isvalid'] == False)
         x = self.nodes[0].validateaddress('mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')
         assert(x['isvalid'] == True)
 
         # Checking mining to an address without a wallet. Generating to a valid address should succeed
         # but generating to an invalid address will fail.
         self.nodes[0].generatetoaddress(
             1, 'mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')
         assert_raises_rpc_error(-5, "Invalid address",
                                 self.nodes[0].generatetoaddress, 1, '3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
 
 
 if __name__ == '__main__':
     DisableWalletTest().main()