diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fca7c4b2d9b9ee4de21afcad3dc18f1fae2a9e46
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+rvm:
+  - ree
+  - 1.9.2
+
+script: "rake cruise"
+env: "TRAVIS=true"
diff --git a/app/models/app_config.rb b/app/models/app_config.rb
index f84a0f46cdbfcb919fc97706522181ee9371d546..b8a7ea1ae23fe72a8e20f43603fa8da27f230e2c 100644
--- a/app/models/app_config.rb
+++ b/app/models/app_config.rb
@@ -9,7 +9,7 @@ class AppConfig < Settingslogic
   namespace Rails.env
 
   def self.load!
-    if no_config_file? && !have_old_config_file?
+    if no_config_file? && !have_old_config_file? && !travis?
       $stderr.puts <<-HELP
 ******** You haven't set up your Diaspora settings file. **********
 Please do the following:
@@ -36,7 +36,7 @@ HELP
     end
 
     super
-    
+
     normalize_pod_url
     normalize_admins
   end
@@ -53,6 +53,10 @@ HELP
     File.exists?(File.join(Rails.root, "config", "app.yml")) || (File.exists?(File.join(Rails.root, "config", "app_config.yml")))
   end
 
+  def self.travis?
+    ENV["TRAVIS"]
+  end
+
   def self.normalize_pod_url
     unless self[:pod_url] =~ /^(https?:\/\/)/ # starts with http:// or https://
       self[:pod_url] = "http://#{self[:pod_url]}"
@@ -94,4 +98,4 @@ HELP
     end
     return @@pod_uri
   end
-end
\ No newline at end of file
+end