diff --git a/src/tests/oldest.t b/src/tests/oldest.t
index 7149db7d2..30718cec3 100755
--- a/src/tests/oldest.t
+++ b/src/tests/oldest.t
@@ -78,7 +78,7 @@ like   ($output, qr/nine/,   'oldest: nine');
 like   ($output, qr/ten/,    'oldest: ten');
 unlike ($output, qr/eleven/, 'no: eleven');
 
-$output = qx{../task rc:oldest.rc oldest 3};
+$output = qx{../task rc:oldest.rc oldest limit:3};
 like   ($output, qr/one/,    'oldest: one');
 like   ($output, qr/two/,    'oldest: two');
 like   ($output, qr/three/,  'oldest: three');
@@ -104,7 +104,7 @@ like   ($output, qr/nine/,   'newest: nine');
 like   ($output, qr/ten/,    'newest: ten');
 like   ($output, qr/eleven/, 'newest: eleven');
 
-$output = qx{../task rc:oldest.rc newest 3};
+$output = qx{../task rc:oldest.rc newest limit:3};
 unlike ($output, qr/one/,    'no: one');
 unlike ($output, qr/two/,    'no: two');
 unlike ($output, qr/three/,  'no: three');
diff --git a/src/tests/tag.t b/src/tests/tag.t
index f55ba0dbf..f5966164f 100755
--- a/src/tests/tag.t
+++ b/src/tests/tag.t
@@ -39,20 +39,20 @@ if (open my $fh, '>', 'tag.rc')
 }
 
 # Add task with tags.
-my $output = qx{../task rc:tag.rc add +1 This +2 is a test +3; ../task rc:tag.rc info 1};
-like ($output, qr/^Tags\s+1 2 3\n/m, 'tags found');
+my $output = qx{../task rc:tag.rc add +one This +two is a test +three; ../task rc:tag.rc info 1};
+like ($output, qr/^Tags\s+one two three\n/m, 'tags found');
 
 # Remove tags.
-$output = qx{../task rc:tag.rc 1 -3 -2 -1; ../task rc:tag.rc info 1};
-unlike ($output, qr/^Tags/m, '-3 -2 -1 tag removed');
+$output = qx{../task rc:tag.rc 1 -three -two -one; ../task rc:tag.rc info 1};
+unlike ($output, qr/^Tags/m, '-three -two -one tag removed');
 
 # Add tags.
-$output = qx{../task rc:tag.rc 1 +4 +5 +6; ../task rc:tag.rc info 1};
-like ($output, qr/^Tags\s+4 5 6\n/m, 'tags found');
+$output = qx{../task rc:tag.rc 1 +four +five +six; ../task rc:tag.rc info 1};
+like ($output, qr/^Tags\s+four five six\n/m, 'tags found');
 
 # Remove tags.
-$output = qx{../task rc:tag.rc 1 -4 -5 -6; ../task rc:tag.rc info 1};
-unlike ($output, qr/^Tags/m, '-4 -5 -6 tag removed');
+$output = qx{../task rc:tag.rc 1 -four -five -six; ../task rc:tag.rc info 1};
+unlike ($output, qr/^Tags/m, '-four -five -six tag removed');
 
 # Add and remove tags.
 $output = qx{../task rc:tag.rc 1 +duplicate -duplicate; ../task rc:tag.rc info 1};