diff --git a/plugins/mezuro/lib/kalibro/client/port.rb b/plugins/mezuro/lib/kalibro/client/port.rb
index 73d653f..1fc74aa 100644
--- a/plugins/mezuro/lib/kalibro/client/port.rb
+++ b/plugins/mezuro/lib/kalibro/client/port.rb
@@ -2,18 +2,12 @@ require 'savon'
 
 class Kalibro::Client::Port
 
-  @@service_address = 'http://localhost:8080/KalibroService/'
-
-  def self.service_address
-    @@service_address
-  end
-
-  def self.service_address=(service_address)
-    @@service_address = service_address
+  def initialize(endpoint)
+    @client = Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
   end
 
-  def initialize(endpoint)
-    @client = Savon::Client.new("#{@@service_address}#{endpoint}Endpoint/?wsdl")
+  def service_address
+    @service_address ||= 'http://localhost:8080/KalibroService/'
   end
 
   def request(action, request_body = nil)
diff --git a/plugins/mezuro/test/unit/kalibro/client/port_test.rb b/plugins/mezuro/test/unit/kalibro/client/port_test.rb
index f542069..3f2a12f 100644
--- a/plugins/mezuro/test/unit/kalibro/client/port_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/client/port_test.rb
@@ -1,14 +1,14 @@
 class PortTest < Test::Unit::TestCase
 
   def setup
-    @service_address = Kalibro::Client::Port.service_address
+    @default_address = 'http://localhost:8080/KalibroService/'
     @client = mock
-    Savon::Client.expects(:new).with("#{@service_address}PortTestEndpoint/?wsdl").returns(@client)
+    Savon::Client.expects(:new).with("#{@default_address}PortTestEndpoint/?wsdl").returns(@client)
     @port = Kalibro::Client::Port.new('PortTest')
   end
 
-  should 'default address be localhost' do
-    assert_equal 'http://localhost:8080/KalibroService/', @service_address
+  should 'get default address' do
+    assert_equal @default_address, @port.service_address
   end
 
   should 'request action and return response' do
--
libgit2 0.21.2