diff --git a/test/functional/wallet-dump.py b/test/functional/wallet-dump.py
--- a/test/functional/wallet-dump.py
+++ b/test/functional/wallet-dump.py
@@ -2,6 +2,7 @@
 # Copyright (c) 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 the dumpwallet RPC."""
 
 import os
 
@@ -89,9 +90,10 @@
 
         found_addr, found_addr_chg, found_addr_rsv, hd_master_addr_unenc = \
             read_dump(tmpdir + "/node0/wallet.unencrypted.dump", addrs, None)
-        assert_equal(found_addr, test_addr_count)
         # all keys must be in the dump
-        assert_equal(found_addr_chg, 50)  # 50 blocks where mined
+        assert_equal(found_addr, test_addr_count)
+        # 50 blocks where mined
+        assert_equal(found_addr_chg, 50)
         # 90 keys plus 100% internal keys
         assert_equal(found_addr_rsv, 90 * 2)
 
@@ -104,8 +106,8 @@
         self.nodes[0].dumpwallet(tmpdir + "/node0/wallet.encrypted.dump")
 
         found_addr, found_addr_chg, found_addr_rsv, hd_master_addr_enc = \
-            read_dump(
-                tmpdir + "/node0/wallet.encrypted.dump", addrs, hd_master_addr_unenc)
+            read_dump(tmpdir + "/node0/wallet.encrypted.dump",
+                      addrs, hd_master_addr_unenc)
         assert_equal(found_addr, test_addr_count)
         # old reserve keys are marked as change now
         assert_equal(found_addr_chg, 90 * 2 + 50)
diff --git a/test/functional/wallet-encryption.py b/test/functional/wallet-encryption.py
--- a/test/functional/wallet-encryption.py
+++ b/test/functional/wallet-encryption.py
@@ -6,7 +6,7 @@
 
 import time
 
-from test_framework.test_framework import BitcoinTestFramework, BITCOIND_PROC_WAIT_TIMEOUT
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     assert_raises_rpc_error,
diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py
--- a/test/functional/wallet-hd.py
+++ b/test/functional/wallet-hd.py
@@ -2,6 +2,7 @@
 # Copyright (c) 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 Hierarchical Deterministic wallet function."""
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -43,7 +44,7 @@
 
         # This should be enough to keep the master key and the non-HD key
         self.nodes[1].backupwallet(tmpdir + "/hd.bak")
-        # self.nodes[1].dumpwallet(tmpdir + "/hd.dump")
+        #self.nodes[1].dumpwallet(tmpdir + "/hd.dump")
 
         # Derive some HD addresses and remember the last
         # Also send funds to each add