diff --git a/app/models/event.rb b/app/models/event.rb
index <HASH>..<HASH> 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,5 +1,5 @@
 class Event < ActiveRecord::Base
-  attr_accessible :lat, :lng, :payload, :user_id, :user
+  attr_accessible :lat, :lng, :payload, :user_id, :user, :expires_at
 
   acts_as_mappable
 
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -19,10 +19,7 @@ describe Event do
 
   describe ".cleanup_expired!" do
     it "removes any Events whose expired_at date is non-null and in the past" do
-      event = Event.new
-      event.agent = agents(:jane_weather_agent)
-      event.expires_at = 2.hours.from_now
-      event.save!
+      event = agents(:jane_weather_agent).create_event :expires_at => 2.hours.from_now
 
       current_time = Time.now
       stub(Time).now { current_time }
add expires_at as attr_accessible