diff --git a/spec/model/user_spec.rb b/spec/model/user_spec.rb
new file mode 100644
index 000000000..78f78f9fa
--- /dev/null
+++ b/spec/model/user_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'user' do
+
+  before(:each) do
+    @user = User.new
+    @user.email = "example@example.com"
+    @user.password = "irrelevant"
+  end
+
+  it 'should save a basic user' do
+    @user.save.should be_true
+  end
+
+  it 'should be fetchable from the database' do
+    @user.save
+    @user2 = User.find_by_email('example@example.com')
+    @user2.email.should_not be_nil
+    @user2.encrypted_password.should_not be_nil
+  end
+
+end