diff --git a/tests/spec/01-basic-spec.js b/tests/spec/001-basic-spec.js
similarity index 97%
rename from tests/spec/01-basic-spec.js
rename to tests/spec/001-basic-spec.js
index da5eea46..8cf8f211 100644
--- a/tests/spec/01-basic-spec.js
+++ b/tests/spec/001-basic-spec.js
@@ -1,7 +1,7 @@
import { Selector as $ } from 'testcafe'
import { getUrl, settingsButton } from '../utils'
-fixture`01-basic-spec.js`
+fixture`001-basic-spec.js`
.page`http://localhost:4002`
test('has the correct
', async t => {
diff --git a/tests/spec/02-login-spec.js b/tests/spec/002-login-spec.js
similarity index 98%
rename from tests/spec/02-login-spec.js
rename to tests/spec/002-login-spec.js
index 9b2113d0..e407262b 100644
--- a/tests/spec/02-login-spec.js
+++ b/tests/spec/002-login-spec.js
@@ -4,7 +4,7 @@ import {
settingsButton
} from '../utils'
-fixture`02-login-spec.js`
+fixture`002-login-spec.js`
.page`http://localhost:4002`
function manualLogin (t, username, password) {
diff --git a/tests/spec/03-basic-timeline-spec.js b/tests/spec/003-basic-timeline-spec.js
similarity index 98%
rename from tests/spec/03-basic-timeline-spec.js
rename to tests/spec/003-basic-timeline-spec.js
index c525df2c..02b6ab4b 100644
--- a/tests/spec/03-basic-timeline-spec.js
+++ b/tests/spec/003-basic-timeline-spec.js
@@ -3,7 +3,7 @@ import { getFirstVisibleStatus, getNthStatus, getUrl, validateTimeline } from '.
import { homeTimeline, notifications, localTimeline, favorites } from '../fixtures'
import { foobarRole } from '../roles'
-fixture`03-basic-timeline-spec.js`
+fixture`003-basic-timeline-spec.js`
.page`http://localhost:4002`
test('Shows the home timeline', async t => {
diff --git a/tests/spec/04-pinned-statuses.js b/tests/spec/004-pinned-statuses.js
similarity index 98%
rename from tests/spec/04-pinned-statuses.js
rename to tests/spec/004-pinned-statuses.js
index ab1f42b7..0bb82293 100644
--- a/tests/spec/04-pinned-statuses.js
+++ b/tests/spec/004-pinned-statuses.js
@@ -2,7 +2,7 @@ import { Selector as $ } from 'testcafe'
import { getUrl } from '../utils'
import { foobarRole } from '../roles'
-fixture`04-pinned-statuses.js`
+fixture`004-pinned-statuses.js`
.page`http://localhost:4002`
test("shows a user's pinned statuses", async t => {
diff --git a/tests/spec/05-status-types.js b/tests/spec/005-status-types.js
similarity index 99%
rename from tests/spec/05-status-types.js
rename to tests/spec/005-status-types.js
index efaa20eb..1383621a 100644
--- a/tests/spec/05-status-types.js
+++ b/tests/spec/005-status-types.js
@@ -1,7 +1,7 @@
import { getNthStatus } from '../utils'
import { foobarRole } from '../roles'
-fixture`05-status-types.js`
+fixture`005-status-types.js`
.page`http://localhost:4002`
test('shows direct vs followers-only vs regular', async t => {
diff --git a/tests/spec/06-tabindex.js b/tests/spec/006-tabindex.js
similarity index 98%
rename from tests/spec/06-tabindex.js
rename to tests/spec/006-tabindex.js
index 00d35532..9e77248a 100644
--- a/tests/spec/06-tabindex.js
+++ b/tests/spec/006-tabindex.js
@@ -2,7 +2,7 @@ import { Selector as $ } from 'testcafe'
import { getNthStatus } from '../utils'
import { foobarRole } from '../roles'
-fixture`06-tabindex.js`
+fixture`006-tabindex.js`
.page`http://localhost:4002`
test('shows correct tabindex in home timeline', async t => {
diff --git a/tests/spec/07-account-profile.js b/tests/spec/007-account-profile.js
similarity index 98%
rename from tests/spec/07-account-profile.js
rename to tests/spec/007-account-profile.js
index 82d5f73a..549d8192 100644
--- a/tests/spec/07-account-profile.js
+++ b/tests/spec/007-account-profile.js
@@ -3,7 +3,7 @@ import { getUrl, validateTimeline } from '../utils'
import { foobarRole } from '../roles'
import { quuxStatuses } from '../fixtures'
-fixture`07-account-profile.js`
+fixture`007-account-profile.js`
.page`http://localhost:4002`
test('shows account profile', async t => {
diff --git a/tests/spec/08-status-media.js b/tests/spec/008-status-media.js
similarity index 98%
rename from tests/spec/08-status-media.js
rename to tests/spec/008-status-media.js
index d6e3f398..f7cdfde2 100644
--- a/tests/spec/08-status-media.js
+++ b/tests/spec/008-status-media.js
@@ -1,7 +1,7 @@
import { closeDialogButton, getNthStatus, modalDialogContents, scrollToStatus } from '../utils'
import { foobarRole } from '../roles'
-fixture`08-status-media.js`
+fixture`008-status-media.js`
.page`http://localhost:4002`
test('shows sensitive images and videos', async t => {
diff --git a/tests/spec/09-threads.js b/tests/spec/009-threads.js
similarity index 97%
rename from tests/spec/09-threads.js
rename to tests/spec/009-threads.js
index 56cd1356..cbaa9c13 100644
--- a/tests/spec/09-threads.js
+++ b/tests/spec/009-threads.js
@@ -3,7 +3,7 @@ import { getNthStatus, getUrl, validateTimeline, scrollToBottomOfTimeline } from
import { foobarRole } from '../roles'
import { quuxThread } from '../fixtures'
-fixture`09-threads.js`
+fixture`009-threads.js`
.page`http://localhost:4002`
test('Shows a thread', async t => {
diff --git a/tests/spec/10-focus.js b/tests/spec/010-focus.js
similarity index 97%
rename from tests/spec/10-focus.js
rename to tests/spec/010-focus.js
index 4f41c4fc..fee95009 100644
--- a/tests/spec/10-focus.js
+++ b/tests/spec/010-focus.js
@@ -3,7 +3,7 @@ import {
} from '../utils'
import { foobarRole } from '../roles'
-fixture`10-focus.js`
+fixture`010-focus.js`
.page`http://localhost:4002`
test('modal preserves focus', async t => {
diff --git a/tests/spec/11-reblog-favorites-count.js b/tests/spec/011-reblog-favorites-count.js
similarity index 97%
rename from tests/spec/11-reblog-favorites-count.js
rename to tests/spec/011-reblog-favorites-count.js
index 6973e1ff..f2c7e8b1 100644
--- a/tests/spec/11-reblog-favorites-count.js
+++ b/tests/spec/011-reblog-favorites-count.js
@@ -2,7 +2,7 @@ import { Selector as $ } from 'testcafe'
import { getFavoritesCount, getNthStatus, getReblogsCount, getUrl } from '../utils'
import { foobarRole } from '../roles'
-fixture`11-reblog-favorites-count.js`
+fixture`011-reblog-favorites-count.js`
.page`http://localhost:4002`
test('shows favorites', async t => {
diff --git a/tests/spec/12-compose.js b/tests/spec/012-compose.js
similarity index 99%
rename from tests/spec/12-compose.js
rename to tests/spec/012-compose.js
index 588bea2e..9de1c142 100644
--- a/tests/spec/12-compose.js
+++ b/tests/spec/012-compose.js
@@ -7,7 +7,7 @@ import {
import { foobarRole } from '../roles'
import times from 'lodash/times'
-fixture`12-compose.js`
+fixture`012-compose.js`
.page`http://localhost:4002`
test('shows compose limits', async t => {
diff --git a/tests/spec/13-compose-media.js b/tests/spec/013-compose-media.js
similarity index 98%
rename from tests/spec/13-compose-media.js
rename to tests/spec/013-compose-media.js
index 31514e1d..fb379c6f 100644
--- a/tests/spec/13-compose-media.js
+++ b/tests/spec/013-compose-media.js
@@ -1,7 +1,7 @@
import { composeInput, getNthDeleteMediaButton, getNthMedia, mediaButton, uploadKittenImage } from '../utils'
import { foobarRole } from '../roles'
-fixture`13-compose-media.js`
+fixture`013-compose-media.js`
.page`http://localhost:4002`
test('inserts media', async t => {
diff --git a/tests/spec/14-compose-post-privacy.js b/tests/spec/014-compose-post-privacy.js
similarity index 94%
rename from tests/spec/14-compose-post-privacy.js
rename to tests/spec/014-compose-post-privacy.js
index 0da69c2c..44a480bd 100644
--- a/tests/spec/14-compose-post-privacy.js
+++ b/tests/spec/014-compose-post-privacy.js
@@ -1,7 +1,7 @@
import { postPrivacyButton } from '../utils'
import { foobarRole } from '../roles'
-fixture`14-compose-post-privacy.js`
+fixture`014-compose-post-privacy.js`
.page`http://localhost:4002`
test('Changes post privacy', async t => {
diff --git a/tests/spec/15-compose-content-warnings.js b/tests/spec/015-compose-content-warnings.js
similarity index 98%
rename from tests/spec/15-compose-content-warnings.js
rename to tests/spec/015-compose-content-warnings.js
index 15b532ba..88d590cc 100644
--- a/tests/spec/15-compose-content-warnings.js
+++ b/tests/spec/015-compose-content-warnings.js
@@ -4,7 +4,7 @@ import {
} from '../utils'
import { foobarRole } from '../roles'
-fixture`15-compose-content-warnings.js`
+fixture`015-compose-content-warnings.js`
.page`http://localhost:4002`
test('Changes content warnings', async t => {
diff --git a/tests/spec/16-external-links.js b/tests/spec/016-external-links.js
similarity index 98%
rename from tests/spec/16-external-links.js
rename to tests/spec/016-external-links.js
index 7a89117e..1146622b 100644
--- a/tests/spec/16-external-links.js
+++ b/tests/spec/016-external-links.js
@@ -2,7 +2,7 @@ import { getNthStatus, getUrl } from '../utils'
import { foobarRole } from '../roles'
import { Selector as $ } from 'testcafe'
-fixture`16-external-links.js`
+fixture`016-external-links.js`
.page`http://localhost:4002`
function getAnchor (nthStatus, nthAnchor) {
diff --git a/tests/spec/30-favorite-unfavorite.js b/tests/spec/100-favorite-unfavorite.js
similarity index 98%
rename from tests/spec/30-favorite-unfavorite.js
rename to tests/spec/100-favorite-unfavorite.js
index ec1f0fdc..cc09b587 100644
--- a/tests/spec/30-favorite-unfavorite.js
+++ b/tests/spec/100-favorite-unfavorite.js
@@ -5,7 +5,7 @@ import {
} from '../utils'
import { foobarRole } from '../roles'
-fixture`30-favorite-unfavorite.js`
+fixture`130-favorite-unfavorite.js`
.page`http://localhost:4002`
test('favorites a status', async t => {
diff --git a/tests/spec/31-reblog-unreblog.js b/tests/spec/101-reblog-unreblog.js
similarity index 98%
rename from tests/spec/31-reblog-unreblog.js
rename to tests/spec/101-reblog-unreblog.js
index 3dee8be3..fb06d068 100644
--- a/tests/spec/31-reblog-unreblog.js
+++ b/tests/spec/101-reblog-unreblog.js
@@ -5,7 +5,7 @@ import {
} from '../utils'
import { foobarRole } from '../roles'
-fixture`31-reblog-unreblog.js`
+fixture`101-reblog-unreblog.js`
.page`http://localhost:4002`
test('reblogs a status', async t => {
diff --git a/tests/spec/32-notifications.js b/tests/spec/102-notifications.js
similarity index 97%
rename from tests/spec/32-notifications.js
rename to tests/spec/102-notifications.js
index 9d7a4804..397527c1 100644
--- a/tests/spec/32-notifications.js
+++ b/tests/spec/102-notifications.js
@@ -3,7 +3,7 @@ import { getNthStatus, getUrl, homeNavButton, notificationsNavButton, validateTi
import { favoriteStatusAsAdmin } from '../serverActions'
import { notifications } from '../fixtures'
-fixture`32-notifications.js`
+fixture`102-notifications.js`
.page`http://localhost:4002`
test('shows unread notifications', async t => {