diff --git a/test/controllers/user_specs.js b/test/app_test.js
similarity index 59%
rename from test/controllers/user_specs.js
rename to test/app_test.js
index cbbc4d7942..241ed435a2 100644
--- a/test/controllers/user_specs.js
+++ b/test/app_test.js
@@ -1,12 +1,10 @@
 var request = require('supertest');
-var app = require('../../app.js');
+var app = require('../app.js');
 
 describe('GET /', function() {
-  it('should return HTTP 200', function(done) {
+  it('should return 200 OK', function(done) {
     request(app)
       .get('/')
       .expect(200, done);
   });
-});
-
-
+});
\ No newline at end of file
diff --git a/test/models/User_spec.js b/test/models/User_spec.js
deleted file mode 100644
index ca44e5c9d9..0000000000
--- a/test/models/User_spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-process.env.NODE_ENV = 'test';
-
-var User = require('../../models/User');
-
-var mocha = require('mocha');
-var chai = require('chai');
-var should = chai.should();
-var expect = chai.expect;
-var mongoose = require('mongoose');
-
-var user;
-
-describe('User attributes', function() {
-  before(function(done) {
-    user = createUser();
-    done();
-  });
-
-  it('_id is a mongoDB ObjectId', function() {
-    user._id.should.be.an.instanceOf(mongoose.Types.ObjectId);
-  });
-
-  it('email should be a string', function() {
-    user.email.should.be.a('string');
-  });
-
-  it('password should be a string', function() {
-    expect(user.password).to.be.a('string');
-  });
-})
-
-function createUser() {
-  var user = new User({
-    email: getEmail(),
-    password: '__password__',
-  });
-  user.save();
-  return user;
-}
-
-// create unique email address
-// 
-// TODO - use an implementation that guarantees string uniqueness
-function getEmail() {
-  return new Date().getTime() + '@example.com';
-}