diff --git a/plugins/mezuro/test/unit/kalibro/client/metric_configuration_client_test.rb b/plugins/mezuro/test/unit/kalibro/client/metric_configuration_client_test.rb
deleted file mode 100644
index 2c5f5c7..0000000
--- a/plugins/mezuro/test/unit/kalibro/client/metric_configuration_client_test.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require "test_helper"
-
-require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
-
-class MetricConfigurationClientTest < ActiveSupport::TestCase
-
-  def setup
-    @port = mock
-    Kalibro::Client::Port.expects(:new).with('MetricConfiguration').returns(@port)
-    @client = Kalibro::Client::MetricConfigurationClient.new
-  end
-
-  should 'save metric configuration' do
-    configuration = MetricConfigurationFixtures.amloc_configuration
-    @port.expects(:request).with(:save_metric_configuration, {
-        :metric_configuration => configuration.to_hash,
-        :configuration_name => 'x'
-      })
-    @client.save(configuration, 'x')
-  end
-
-  should 'get metric configuration by name' do
-    configuration = MetricConfigurationFixtures.amloc_configuration
-    request_body = {
-      :configuration_name => 'configuration.name',
-      :metric_name => configuration.metric.name
-    }
-    response_hash = {:metric_configuration => configuration.to_hash}
-    @port.expects(:request).with(:get_metric_configuration, request_body).returns(response_hash)
-    assert_equal configuration, @client.metric_configuration('configuration.name', configuration.metric.name)
-  end
-
-  should 'remove metric configuration by name' do
-    metric_name = 'MetricConfigurationClientTest'
-    configuration_name = 'xxxx'
-    request_body = {
-      :configuration_name => configuration_name,
-      :metric_name => metric_name
-    }
-    @port.expects(:request).with(:remove_metric_configuration, request_body)
-    @client.remove(configuration_name, metric_name)
-  end
-
-end
\ No newline at end of file
diff --git a/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb b/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb
deleted file mode 100644
index d4e9e65..0000000
--- a/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require "test_helper"
-
-require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
-require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/range_fixtures"
-
-class MetricConfigurationTest < ActiveSupport::TestCase
-
-  def setup
-    @hash = MetricConfigurationFixtures.amloc_configuration_hash
-    @metric_configuration = MetricConfigurationFixtures.amloc_configuration
-    @metric_configuration_without_ranges = MetricConfigurationFixtures.metric_configuration_without_ranges
-    @range1 = RangeFixtures.amloc_excellent
-    @range2 = RangeFixtures.amloc_bad
-  end
-
-  should 'create metric configuration from hash' do
-    assert_equal @metric_configuration, Kalibro::Entities::MetricConfiguration.from_hash(@hash)
-  end
-
-  should 'convert metric configuration to hash' do
-    assert_equal @hash, @metric_configuration.to_hash
-  end
-
-  should 'create appropriate metric type' do
-    amloc = MetricConfigurationFixtures.amloc_configuration
-    sc = MetricConfigurationFixtures.sc_configuration
-    assert amloc.metric.instance_of?(Kalibro::Entities::NativeMetric)
-    assert sc.metric.instance_of?(Kalibro::Entities::CompoundMetric)
-  end
-
-  should 'add a range to an empty range list' do
-    @metric_configuration_without_ranges.add_range @range1
-    assert_equal @metric_configuration_without_ranges.ranges, [@range1]
-  end
-  
-  should 'add a range to an non-empty range list' do
-    @metric_configuration_without_ranges.ranges = [@range1]
-    @metric_configuration_without_ranges.add_range @range2
-    assert_equal @metric_configuration_without_ranges.ranges, [@range1, @range2]
-  end
-
-
-end
--
libgit2 0.21.2