diff --git a/src/routes/test/oauth2-test.js b/src/routes/test/oauth2-test.js
index 82b359a78..80de7a7dc 100644
--- a/src/routes/test/oauth2-test.js
+++ b/src/routes/test/oauth2-test.js
@@ -1318,8 +1318,8 @@ describe('Password', function () {
         it('reset request succeeds', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/password/resetRequest.html')
             .end(function (error, result) {
-                expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
                 expect(result.statusCode).to.equal(200);
+                expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
                 done();
             });
         });
@@ -1327,7 +1327,8 @@ describe('Password', function () {
         it('setup fails due to missing reset_token', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/account/setup.html')
             .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
+                expect(result.statusCode).to.equal(200);
+                expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
                 done();
             });
         });
@@ -1336,7 +1337,8 @@ describe('Password', function () {
             superagent.get(SERVER_URL + '/api/v1/session/account/setup.html')
             .query({ reset_token: hat(256) })
             .end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
+                expect(result.statusCode).to.equal(200);
+                expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
                 done();
             });
         });
diff --git a/src/routes/test/simpleauth-test.js b/src/routes/test/simpleauth-test.js
index 0453c0b58..d803bf956 100644
--- a/src/routes/test/simpleauth-test.js
+++ b/src/routes/test/simpleauth-test.js
@@ -39,7 +39,7 @@ describe('SimpleAuth API', function () {
         manifest: { version: '0.1.0', addons: { } },
         location: 'test1',
         portBindings: {},
-        accessRestriction: { users: [ 'foobar', USERNAME, 'someone' ] },
+        accessRestriction: { users: [ 'foobar', 'someone' ] },
         memoryLimit: 0
     };
 
@@ -138,7 +138,14 @@ describe('SimpleAuth API', function () {
                     expect(scope1.isDone()).to.be.ok();
                     expect(scope2.isDone()).to.be.ok();
 
-                    callback();
+                    superagent.get(SERVER_URL + '/api/v1/profile').query({ access_token: result.body.token}).end(function (error, result) {
+                        expect(error).to.not.be.ok();
+                        expect(result.statusCode).to.eql(200);
+
+                        APP_1.accessRestriction.users.push(result.body.id);
+
+                        callback();
+                    });
                 });
             },