diff --git a/test/functional/disablewallet.py b/test/functional/disablewallet.py
index 3f77a1828..d34451341 100755
--- a/test/functional/disablewallet.py
+++ b/test/functional/disablewallet.py
@@ -21,6 +21,8 @@ class DisableWalletTest (BitcoinTestFramework):
         self.extra_args = [["-disablewallet"]]
 
     def run_test (self):
+        # Make sure wallet is really disabled
+        assert_raises_jsonrpc(-32601, 'Method not found', self.nodes[0].getwalletinfo)
         x = self.nodes[0].validateaddress('3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
         assert(x['isvalid'] == False)
         x = self.nodes[0].validateaddress('mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')