diff --git a/raft/node.go b/raft/node.go
index b4e2e6f51..e554e3e19 100644
--- a/raft/node.go
+++ b/raft/node.go
@@ -192,6 +192,7 @@ type node struct {
 	advancec chan struct{}
 	tickc    chan struct{}
 	done     chan struct{}
+	stop     chan struct{}
 }
 
 func newNode() node {
@@ -204,11 +205,13 @@ func newNode() node {
 		advancec: make(chan struct{}),
 		tickc:    make(chan struct{}),
 		done:     make(chan struct{}),
+		stop:     make(chan struct{}),
 	}
 }
 
 func (n *node) Stop() {
-	close(n.done)
+	n.stop <- struct{}{}
+	<-n.stop
 }
 
 func (n *node) run(r *raft) {
@@ -302,7 +305,9 @@ func (n *node) run(r *raft) {
 			}
 			r.raftLog.stableTo(prevLastUnstablei)
 			advancec = nil
-		case <-n.done:
+		case <-n.stop:
+			n.stop <- struct{}{}
+			close(n.done)
 			return
 		}
 	}
diff --git a/raft/node_test.go b/raft/node_test.go
index a101e230a..a2f43d265 100644
--- a/raft/node_test.go
+++ b/raft/node_test.go
@@ -140,6 +140,20 @@ func TestBlockProposal(t *testing.T) {
 	}
 }
 
+// TestNodeTick ensures that node.Tick() will increase the
+// elapsed of the underly raft state machine.
+func TestNodeTick(t *testing.T) {
+	n := newNode()
+	r := newRaft(1, []uint64{1}, 10, 1)
+	go n.run(r)
+	elapsed := r.elapsed
+	n.Tick()
+	n.Stop()
+	if r.elapsed != elapsed+1 {
+		t.Errorf("elapsed = %d, want %d", r.elapsed, elapsed+1)
+	}
+}
+
 func TestReadyContainUpdates(t *testing.T) {
 	tests := []struct {
 		rd       Ready