diff --git a/test/functional/rpc_deprecated.py b/test/functional/rpc_deprecated.py
index e62249b72..c8445bfd0 100755
--- a/test/functional/rpc_deprecated.py
+++ b/test/functional/rpc_deprecated.py
@@ -1,33 +1,36 @@
 #!/usr/bin/env python3
 # Copyright (c) 2017-2019 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 deprecation of RPC calls."""
 from test_framework.test_framework import BitcoinTestFramework
 
 
 class DeprecatedRpcTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
-        self.setup_clean_chain = True
-        self.extra_args = [[], ["-deprecatedrpc=banscore"]]
+        self.extra_args = [[],
+                           ["-deprecatedrpc=banscore",
+                            "-deprecatedrpc=getpeerinfo_addnode",
+                            "-deprecatedrpc=whitelisted"]]
 
     def run_test(self):
         # This test should be used to verify correct behaviour of deprecated
         # RPC methods with and without the -deprecatedrpc flags. For example:
         #
         # In set_test_params:
         # self.extra_args = [[], ["-deprecatedrpc=generate"]]
         #
         # In run_test:
         # self.log.info("Test generate RPC")
         # assert_raises_rpc_error(-32, 'The wallet generate rpc method is deprecated', self.nodes[0].rpc.generate, 1)
         # self.nodes[1].generate(1)
 
-        self.log.info("Test deprecated banscore")
-        assert 'banscore' not in self.nodes[0].getpeerinfo()[0]
-        assert 'banscore' in self.nodes[1].getpeerinfo()[0]
+        self.log.info("Test deprecated fields from getpeerinfo")
+        for key in ['banscore', 'addnode', 'whitelisted']:
+            assert key not in self.nodes[0].getpeerinfo()[0]
+            assert key in self.nodes[1].getpeerinfo()[0]
 
 
 if __name__ == '__main__':
     DeprecatedRpcTest().main()
diff --git a/test/functional/rpc_getpeerinfo_deprecation.py b/test/functional/rpc_getpeerinfo_deprecation.py
deleted file mode 100755
index c27035150..000000000
--- a/test/functional/rpc_getpeerinfo_deprecation.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2020 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 deprecation of getpeerinfo RPC fields."""
-
-from test_framework.test_framework import BitcoinTestFramework
-
-
-class GetpeerinfoDeprecationTest(BitcoinTestFramework):
-    def set_test_params(self):
-        self.num_nodes = 2
-        self.extra_args = [[], ["-deprecatedrpc=banscore"]]
-
-    def run_test(self):
-        self.test_banscore_deprecation()
-        self.test_addnode_deprecation()
-
-    def test_banscore_deprecation(self):
-        self.log.info(
-            "Test getpeerinfo by default no longer returns a banscore field")
-        assert "banscore" not in self.nodes[0].getpeerinfo()[0].keys()
-
-        self.log.info(
-            "Test getpeerinfo returns banscore with -deprecatedrpc=banscore")
-        assert "banscore" in self.nodes[1].getpeerinfo()[0].keys()
-
-    def test_addnode_deprecation(self):
-        self.restart_node(1, ["-deprecatedrpc=getpeerinfo_addnode"])
-        self.connect_nodes(0, 1)
-
-        self.log.info(
-            "Test getpeerinfo by default no longer returns an addnode field")
-        assert "addnode" not in self.nodes[0].getpeerinfo()[0].keys()
-
-        self.log.info(
-            "Test getpeerinfo returns addnode with -deprecatedrpc=addnode")
-        assert "addnode" in self.nodes[1].getpeerinfo()[0].keys()
-
-
-if __name__ == "__main__":
-    GetpeerinfoDeprecationTest().main()