diff --git a/.gitignore b/.gitignore
index c559d22..50be67f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 node_modules
 test/workspace
 test/distributor/workspace
+test/repos/mercurial/.hg/strip-backup
 static/css/**/*.css
 static/fonts
 static/js/libs
diff --git a/test/distributor/runSelfAfterCatchRev.js b/test/distributor/runSelfAfterCatchRev.js
index 4cc291f..f246baf 100644
--- a/test/distributor/runSelfAfterCatchRev.js
+++ b/test/distributor/runSelfAfterCatchRev.js
@@ -69,8 +69,9 @@ describe('Distributor run self after catch', function() {
 		itRunWithRev(1, 1);
 		itRunWithRev(2, 2);
 
-		it('should call run 3 times in total', function() {
-			expect(executorRunSpy.callCount).equal(3);
+		var revsCount = helpers.mercurialRevs.length;
+		it('should call run ' + revsCount + ' times in total', function() {
+			expect(executorRunSpy.callCount).equal(revsCount);
 		});
 
 	});
diff --git a/test/executor.js b/test/executor.js
index 5c66f34..ef8d135 100644
--- a/test/executor.js
+++ b/test/executor.js
@@ -55,13 +55,16 @@ var expect = require('expect.js'),
 				});
 			});
 
-			it('scm data should be rev: 2, changes: [0-2], latest', function() {
-				expect(scmData).eql({
-					rev: mercurialRevs[2],
-					changes: mercurialRevs.slice().reverse(),
-					isLatest: true
-				});
-			});
+			it(
+				'scm data should be rev: last, changes: [0-last], is latest',
+				function() {
+					expect(scmData).eql({
+						rev: mercurialRevs[mercurialRevs.length - 1],
+						changes: mercurialRevs.slice().reverse(),
+						isLatest: true
+					});
+				}
+			);
 		});
 
 		describe('with scm rev default and catch rev "first revision"', function() {
@@ -98,13 +101,17 @@ var expect = require('expect.js'),
 				executor.run({}, done);
 			});
 
-			it('scm data should be rev: 2, changes: [2], latest', function() {
-				expect(scmData).eql({
-					rev: mercurialRevs[2],
-					changes: mercurialRevs.slice(2, 3).reverse(),
-					isLatest: true
-				});
-			});
+			it(
+				'scm data should be rev: last, changes: [2-last], is latest',
+				function() {
+					expect(scmData).eql({
+						rev: mercurialRevs[mercurialRevs.length - 1],
+						changes: mercurialRevs.slice(2).reverse(),
+						isLatest: true
+					});
+				}
+			);
+
 		});
 
 	});
diff --git a/test/helpers.js b/test/helpers.js
index 2a44764..e61fee8 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -34,4 +34,9 @@ exports.mercurialRevs = [{
 	author: 'kotbegemot',
 	date: new Date('Sat May 10 03:18:20 2014 +0400').getTime(),
 	comment: 'third revision'
+}, {
+	id: '2ff4bec8b4cc',
+	author: 'okv',
+	date: new Date('Sun Jun 28 10:54:22 2015 +0300').getTime(),
+	comment: 'add tags'
 }];
diff --git a/test/repos/mercurial/.hg/undo.bookmarks b/test/repos/mercurial/.hg/bookmarks
similarity index 100%
rename from test/repos/mercurial/.hg/undo.bookmarks
rename to test/repos/mercurial/.hg/bookmarks
diff --git a/test/repos/mercurial/.hg/cache/branchheads-served b/test/repos/mercurial/.hg/cache/branchheads-served
index fc7124a..1e7ff6a 100644
--- a/test/repos/mercurial/.hg/cache/branchheads-served
+++ b/test/repos/mercurial/.hg/cache/branchheads-served
@@ -1,2 +1,2 @@
-9d7d08445f4ce095c22a98a902a391973cf07f37 2
-9d7d08445f4ce095c22a98a902a391973cf07f37 default
+2ff4bec8b4ccc89af0bcabc0710713573078ebdb 3
+2ff4bec8b4ccc89af0bcabc0710713573078ebdb default
diff --git a/test/repos/mercurial/.hg/cache/tags b/test/repos/mercurial/.hg/cache/tags
index fd30fa0..417d383 100644
--- a/test/repos/mercurial/.hg/cache/tags
+++ b/test/repos/mercurial/.hg/cache/tags
@@ -1,2 +1,5 @@
-2 9d7d08445f4ce095c22a98a902a391973cf07f37
+3 2ff4bec8b4ccc89af0bcabc0710713573078ebdb 8354ec217ac72171221f831e40a640e499e0f246
 
+da2762e71e87935198a25b0fceab0a364ad2e6d7 zero revision
+9d7d08445f4ce095c22a98a902a391973cf07f37 second revision
+9d7d08445f4ce095c22a98a902a391973cf07f37 release 0.1.0
diff --git a/test/repos/mercurial/.hg/dirstate b/test/repos/mercurial/.hg/dirstate
index af34498..c2b7cb6 100644
Binary files a/test/repos/mercurial/.hg/dirstate and b/test/repos/mercurial/.hg/dirstate differ
diff --git a/test/repos/mercurial/.hg/last-message.txt b/test/repos/mercurial/.hg/last-message.txt
index 198b493..ba4dae4 100644
--- a/test/repos/mercurial/.hg/last-message.txt
+++ b/test/repos/mercurial/.hg/last-message.txt
@@ -1 +1 @@
-third revision
\ No newline at end of file
+temporary amend commit for 6e9e54ed42ff
\ No newline at end of file
diff --git a/test/repos/mercurial/.hg/store/00changelog.i b/test/repos/mercurial/.hg/store/00changelog.i
index 2408bbc..689f030 100644
Binary files a/test/repos/mercurial/.hg/store/00changelog.i and b/test/repos/mercurial/.hg/store/00changelog.i differ
diff --git a/test/repos/mercurial/.hg/store/00manifest.i b/test/repos/mercurial/.hg/store/00manifest.i
index 9fb881c..254a681 100644
Binary files a/test/repos/mercurial/.hg/store/00manifest.i and b/test/repos/mercurial/.hg/store/00manifest.i differ
diff --git a/test/repos/mercurial/.hg/store/data/~2ehgtags.i b/test/repos/mercurial/.hg/store/data/~2ehgtags.i
new file mode 100644
index 0000000..2c5d2d9
Binary files /dev/null and b/test/repos/mercurial/.hg/store/data/~2ehgtags.i differ
diff --git a/test/repos/mercurial/.hg/store/fncache b/test/repos/mercurial/.hg/store/fncache
index cacbeb0..cb5f57c 100644
--- a/test/repos/mercurial/.hg/store/fncache
+++ b/test/repos/mercurial/.hg/store/fncache
@@ -1,3 +1,4 @@
+data/.hgtags.i
 data/rev0.txt.i
 data/rev1.txt.i
 data/rev2.txt.i
diff --git a/test/repos/mercurial/.hg/store/undo b/test/repos/mercurial/.hg/store/undo
deleted file mode 100644
index 3861be4..0000000
Binary files a/test/repos/mercurial/.hg/store/undo and /dev/null differ
diff --git a/test/repos/mercurial/.hg/store/undo.phaseroots b/test/repos/mercurial/.hg/store/undo.phaseroots
deleted file mode 100644
index 025c6a7..0000000
--- a/test/repos/mercurial/.hg/store/undo.phaseroots
+++ /dev/null
@@ -1 +0,0 @@
-1 da2762e71e87935198a25b0fceab0a364ad2e6d7
diff --git a/test/repos/mercurial/.hg/undo.branch b/test/repos/mercurial/.hg/undo.branch
deleted file mode 100644
index 331d858..0000000
--- a/test/repos/mercurial/.hg/undo.branch
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/test/repos/mercurial/.hg/undo.desc b/test/repos/mercurial/.hg/undo.desc
deleted file mode 100644
index 2aa13db..0000000
--- a/test/repos/mercurial/.hg/undo.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-commit
diff --git a/test/repos/mercurial/.hg/undo.dirstate b/test/repos/mercurial/.hg/undo.dirstate
deleted file mode 100644
index 1a6daad..0000000
Binary files a/test/repos/mercurial/.hg/undo.dirstate and /dev/null differ
diff --git a/test/repos/mercurial/.hgtags b/test/repos/mercurial/.hgtags
new file mode 100644
index 0000000..cdfc9be
--- /dev/null
+++ b/test/repos/mercurial/.hgtags
@@ -0,0 +1,3 @@
+da2762e71e87935198a25b0fceab0a364ad2e6d7 zero revision
+9d7d08445f4ce095c22a98a902a391973cf07f37 second revision
+9d7d08445f4ce095c22a98a902a391973cf07f37 release 0.1.0
diff --git a/test/scm.js b/test/scm.js
index e81b821..28dae1d 100644
--- a/test/scm.js
+++ b/test/scm.js
@@ -75,26 +75,25 @@ var expect = require('expect.js'),
 			scm.pull(scm.defaultRev, done);
 		});
 
-		it('now (after pull) expect rev1 and rev2 as new changes (in reverse ' +
+		it('now (after pull) expect all after rev 0 as new changes (in reverse ' +
 			'order) from rev0 to default revision', function(done) {
 			scm.getChanges(data[0].id, scm.defaultRev, function(err, changes) {
 				if (err) return done(err);
 				expect(changes).ok();
-				expect(changes).length(2);
-				expect(changes).eql([data[2], data[1]]);
+				expect(changes).eql(data.slice(1).reverse());
 				done();
 			});
 		});
 
-		it('update to default revision (should update to rev2) without error',
+		it('update to default revision (should update to last) without error',
 			function(done) {
 				scm.update(scm.defaultRev, done);
 			});
 
-		it('expect current revision equals to rev2', function(done) {
+		it('expect current revision equals to last', function(done) {
 			scm.getCurrent(function(err, rev) {
 				if (err) return done(err);
-				expect(rev).eql(data[2]);
+				expect(rev).eql(data[data.length - 1]);
 				done();
 			});
 		});
@@ -104,12 +103,11 @@ var expect = require('expect.js'),
 		});
 
 		it('expect repository log from rev0 to default revision equals to ' +
-			'rev1 and rev2 (in reverse order)', function(done) {
+			'all revs followed by rev 0 (in reverse order)', function(done) {
 			scm.getChanges(data[0].id, scm.defaultRev, function(err, changes) {
 				if (err) return done(err);
 				expect(changes).ok();
-				expect(changes).length(2);
-				expect(changes).eql([data[2], data[1]]);
+				expect(changes).eql(data.slice(1).reverse());
 				done();
 			});
 		});