diff --git a/app/models/environment.rb b/app/models/environment.rb
index c82774d..5479a12 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -523,9 +523,6 @@ class Environment < ActiveRecord::Base
       domain = (self.domains.find_by_is_default(true) || self.domains.find(:first, :order => 'id')).name
       domain = email_hostname ? domain : (force_www ? ('www.' + domain) : domain)
     end
-    if Noosfero.url_options.has_key?(:port)
-      domain += ":#{Noosfero.url_options[:port]}"
-    end
     domain
   end
 
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 7347b0b..db6f85d 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -234,11 +234,9 @@ class EnvironmentTest < Test::Unit::TestCase
 
   should 'include port in default top URL for development environment' do
     env = Environment.new
-    env.expects(:default_hostname).returns('www.lalala.net')
-
     Noosfero.expects(:url_options).returns({ :port => 9999 }).at_least_once
 
-    assert_equal 'http://www.lalala.net:9999', env.top_url
+    assert_equal 'http://localhost:9999', env.top_url
   end
 
   should 'use https when asked for a ssl url' do
@@ -1119,10 +1117,10 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal ["Meter", "Kilo", "Litre"], Environment.default.units.map(&:singular)
   end
 
-  should 'include port in default hostname for development environment' do
+  should 'not include port in default hostname' do
     env = Environment.new
-    Noosfero.expects(:url_options).returns({ :port => 9999 }).at_least_once
-    assert_equal 'localhost:9999', env.default_hostname
+    Noosfero.stubs(:url_options).returns({ :port => 9999 })
+    assert_no_match /9999/, env.default_hostname
   end
 
 end
--
libgit2 0.21.2