diff --git a/app/models/environment.rb b/app/models/environment.rb
index 4374158..131d57a 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -151,7 +151,7 @@ class Environment < ActiveRecord::Base
 
   def default_hostname
     if self.domains(true).empty?
-      'localhost.localdomain'
+      'localhost'
     else
       self.domains.find(:first, :order => 'id').name
     end
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 27e67b9..e4b655d 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -151,9 +151,9 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal 'example.com', env.default_hostname
   end
 
-  should 'default to localhost.localdomain as hostname' do
+  should 'default to localhost as hostname' do
     env = Environment.create!(:name => 'test environment')
-    assert_equal 'localhost.localdomain', env.default_hostname
+    assert_equal 'localhost', env.default_hostname
   end
 
   should 'provide an approval_method setting' do
--
libgit2 0.21.2