diff --git a/test/functional/deprecated_rpc.py b/test/functional/deprecated_rpc.py
new file mode 100755
index 000000000000..34ebc84d82f5
--- /dev/null
+++ b/test/functional/deprecated_rpc.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-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 deprecation of RPC calls."""
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_raises_jsonrpc
+
+class DeprecatedRpcTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = True
+        self.extra_args = [[], ["-enablerpcmethod=estimatefee"]]
+
+    def run_test(self):
+        self.log.info("estimatefee: Shows deprecated message")
+        assert_raises_jsonrpc(-32, 'estimatefee is deprecated',
+                self.nodes[0].estimatefee, 1)
+
+        self.log.info("Using -enablerpcmethod=estimatefee bypasses the error")
+        self.nodes[1].estimatefee(1)
+
+
+if __name__ == '__main__':
+    DeprecatedRpcTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index dfd3b89895b0..f2bc7d6b8d4f 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -96,6 +96,7 @@
     'disconnect_ban.py',
     'decodescript.py',
     'blockchain.py',
+    'deprecated_rpc.py',
     'disablewallet.py',
     'net.py',
     'keypool.py',