diff --git a/test/functional/rpc_invalid_address_message.py b/test/functional/rpc_invalid_address_message.py
index e362642f0fa3a..7ab5a5e90d45b 100755
--- a/test/functional/rpc_invalid_address_message.py
+++ b/test/functional/rpc_invalid_address_message.py
@@ -29,9 +29,6 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
 
-    def skip_test_if_missing_module(self):
-        self.skip_if_no_wallet()
-
     def test_validateaddress(self):
         node = self.nodes[0]
 
@@ -60,6 +57,10 @@ def test_validateaddress(self):
         assert info['isvalid']
         assert 'error' not in info
 
+        info = node.validateaddress(BECH32_INVALID_VERSION)
+        assert not info['isvalid']
+        assert_equal(info['error'], 'Invalid Bech32 address witness version')
+
         # Base58
         info = node.validateaddress(BASE58_INVALID_PREFIX)
         assert not info['isvalid']
@@ -87,7 +88,10 @@ def test_getaddressinfo(self):
 
     def run_test(self):
         self.test_validateaddress()
-        self.test_getaddressinfo()
+
+        if self.is_wallet_compiled():
+            self.init_wallet(0)
+            self.test_getaddressinfo()
 
 
 if __name__ == '__main__':