diff --git a/test/nodes/core/storage/28-tail_spec.js b/test/nodes/core/storage/28-tail_spec.js
index 3e9c805bd..ea0ba849c 100644
--- a/test/nodes/core/storage/28-tail_spec.js
+++ b/test/nodes/core/storage/28-tail_spec.js
@@ -72,8 +72,10 @@ describe('TailNode', function() {
             helperNode1.on("input", function(msg) {
                 msg.should.have.property('topic', fileToTail);
                 msg.payload.should.equal("Tail message line" + (++inputCounter));
+                if(inputCounter === 2) {
+                    done();
+                }
             });
-            done();
         });
     });
     
@@ -86,8 +88,8 @@ describe('TailNode', function() {
             helperNode1.on("input", function(msg) {
                 msg.should.have.property('topic', fileToTail);
                 msg.payload.should.equal("Tail message line1\nTail message line2\n");
+                done();
             });
-            done();
         });
     });
 });