diff --git a/src/avalanche/test/voterecord_tests.cpp b/src/avalanche/test/voterecord_tests.cpp
--- a/src/avalanche/test/voterecord_tests.cpp
+++ b/src/avalanche/test/voterecord_tests.cpp
@@ -10,15 +10,24 @@
 
 using namespace avalanche;
 
+NodeId nextNodeId(NodeId &nodeid) {
+    nodeid++;
+    if (nodeid >= 8) {
+        nodeid = 0;
+    }
+    return nodeid;
+}
+
 BOOST_FIXTURE_TEST_SUITE(voterecord_tests, TestingSetup)
 
 #define REGISTER_VOTE_AND_CHECK(vr, vote, state, finalized, confidence)        \
-    vr.registerVote(NO_NODE, vote);                                            \
+    vr.registerVote(nextNodeId(nodeid), vote);                                 \
     BOOST_CHECK_EQUAL(vr.isAccepted(), state);                                 \
     BOOST_CHECK_EQUAL(vr.hasFinalized(), finalized);                           \
     BOOST_CHECK_EQUAL(vr.getConfidence(), confidence);
 
 BOOST_AUTO_TEST_CASE(vote_record) {
+    NodeId nodeid = -1;
     VoteRecord vraccepted(true);
 
     // Check initial state.
@@ -118,16 +127,6 @@
     }
 }
 
-namespace {
-NodeId nextNodeId(NodeId &nodeid) {
-    nodeid++;
-    if (nodeid >= 8) {
-        nodeid = 0;
-    }
-    return nodeid;
-}
-} // namespace
-
 BOOST_AUTO_TEST_CASE(duplicate_votes) {
     VoteRecord vr(true);
     NodeId nodeid = -1;
diff --git a/src/avalanche/voterecord.cpp b/src/avalanche/voterecord.cpp
--- a/src/avalanche/voterecord.cpp
+++ b/src/avalanche/voterecord.cpp
@@ -59,11 +59,6 @@
 }
 
 bool VoteRecord::addNodeToQuorum(NodeId nodeid) {
-    if (nodeid == NO_NODE) {
-        // Helpful for testing.
-        return true;
-    }
-
     // MMIX Linear Congruent Generator.
     const uint64_t r1 =
         6364136223846793005 * uint64_t(nodeid) + 1442695040888963407;