diff --git a/bigchaindb/commands/bigchaindb.py b/bigchaindb/commands/bigchaindb.py
index 5fabc769..19cb0e2d 100644
--- a/bigchaindb/commands/bigchaindb.py
+++ b/bigchaindb/commands/bigchaindb.py
@@ -216,7 +216,6 @@ def run_upsert_validator_show(args, bigchain):
 
     logger.info(response)
 
-    # TODO: Remove this once tests/commands/test_utils.test_configure_bigchaindb_logging.py is fixed
     return response
 
 
diff --git a/tests/upsert_validator/test_validator_election.py b/tests/upsert_validator/test_validator_election.py
index 5d33912a..d09d6403 100644
--- a/tests/upsert_validator/test_validator_election.py
+++ b/tests/upsert_validator/test_validator_election.py
@@ -155,13 +155,6 @@ def test_upsert_validator_show(caplog, ongoing_election, b):
     show_args = Namespace(action='show',
                           election_id=election_id)
 
-    # TODO: Turn this back on once tests/commands/test_utils.test_configure_bigchaindb_logging.py is fixed
-    # with caplog.at_level(logging.INFO):
-    #     run_upsert_validator_show(show_args, b)
-    #     msg = caplog.records.pop().msg
-    #     assert msg == f'public_key={public_key}\npower={power}\nnode_id={node_id}\nstatus={status}'
-
-    # TODO: Remove everything after this once tests/commands/test_utils.test_configure_bigchaindb_logging.py is fixed
     msg = run_upsert_validator_show(show_args, b)
 
     assert msg == f'public_key={public_key}\npower={power}\nnode_id={node_id}\nstatus={status}'