diff --git a/plugins/mezuro/test/unit/kalibro/compound_metric_test.rb b/plugins/mezuro/test/unit/kalibro/compound_metric_test.rb
deleted file mode 100644
index c3437d2..0000000
--- a/plugins/mezuro/test/unit/kalibro/compound_metric_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "test_helper"
-
-require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/compound_metric_fixtures"
-
-class CompoundMetricTest < ActiveSupport::TestCase
-
-  def setup
-    @hash = CompoundMetricFixtures.compound_metric_hash
-    @metric = CompoundMetricFixtures.compound_metric
-  end
-
-  should 'create compound metric from hash' do
-    assert_equal @hash[:script], Kalibro::CompoundMetric.new(@hash).script
-  end
-
-  should 'convert compound metric to hash' do
-    assert_equal @hash, @metric.to_hash
-  end
-
-end
diff --git a/plugins/mezuro/test/unit/kalibro/metric_test.rb b/plugins/mezuro/test/unit/kalibro/metric_test.rb
new file mode 100644
index 0000000..11c2759
--- /dev/null
+++ b/plugins/mezuro/test/unit/kalibro/metric_test.rb
@@ -0,0 +1,29 @@
+require "test_helper"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_fixtures"
+
+class MetricTest < ActiveSupport::TestCase
+
+  def setup
+    @native_hash = MetricFixtures.amloc_hash
+    @native = MetricFixtures.amloc
+    @compound_hash = MetricFixtures.compound_metric_hash
+    @compound = MetricFixtures.compound_metric
+  end
+
+  should 'create native metric from hash' do
+    assert_equal @native_hash[:name], Kalibro::Metric.new(@native_hash).name
+  end
+
+  should 'convert native metric to hash' do
+    assert_equal @native_hash, @native.to_hash
+  end
+
+  should 'create compound metric from hash' do
+    assert_equal @compound_hash[:script], Kalibro::Metric.new(@compound_hash).script
+  end
+
+  should 'convert compound metric to hash' do
+    assert_equal @compound_hash, @compound.to_hash
+  end
+
+end
diff --git a/plugins/mezuro/test/unit/kalibro/native_metric_test.rb b/plugins/mezuro/test/unit/kalibro/native_metric_test.rb
deleted file mode 100644
index 616aaf7..0000000
--- a/plugins/mezuro/test/unit/kalibro/native_metric_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "test_helper"
-
-require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/native_metric_fixtures"
-
-class NativeMetricTest < ActiveSupport::TestCase
-
-  def setup
-    @hash = NativeMetricFixtures.amloc_hash
-    @metric = NativeMetricFixtures.amloc
-  end
-
-  should 'create native metric from hash' do
-    assert_equal @hash[:name], Kalibro::NativeMetric.new(@hash).name
-  end
-
-  should 'convert native metric to hash' do
-    assert_equal @hash, @metric.to_hash
-  end
-
-end
--
libgit2 0.21.2