diff --git a/tests/Feature/MetricsFacadeTest.php b/tests/Feature/MetricsFacadeTest.php
index 2084b9e627..a1200280ae 100644
--- a/tests/Feature/MetricsFacadeTest.php
+++ b/tests/Feature/MetricsFacadeTest.php
@@ -31,10 +31,10 @@ protected function setUp(): void
     public function test_facade_can_register_and_increment_counter()
     {
         // Register a counter using the Facade
-        Metrics::registerCounter('facade_counter', 'Test counter via facade');
+        $counter = Metrics::counter('facade_counter', 'Test counter via facade');
 
         // Increment the counter
-        Metrics::incrementCounter('facade_counter');
+        $counter->inc();
 
         // Verify that the metric was registered and incremented
         $this->assertTrue(true); // In this point we assume that there are no errors
@@ -46,8 +46,8 @@ public function test_facade_can_register_and_increment_counter()
     public function test_facade_can_render_metrics()
     {
         // Register and increment a counter
-        Metrics::registerCounter('facade_render_test', 'Render test via facade');
-        Metrics::incrementCounter('facade_render_test');
+        $counter = Metrics::counter('facade_render_test', 'Render test via facade');
+        $counter->inc();
 
         // Render the metrics
         $output = Metrics::renderMetrics();
diff --git a/tests/unit/MetricsServiceTest.php b/tests/unit/MetricsServiceTest.php
index d0caa7585e..9b809eed9d 100644
--- a/tests/unit/MetricsServiceTest.php
+++ b/tests/unit/MetricsServiceTest.php
@@ -2,9 +2,10 @@
 
 namespace Tests\Unit;
 
-use PHPUnit\Framework\TestCase;
 use ProcessMaker\Services\MetricsService;
 use Prometheus\Storage\InMemory;
+use Illuminate\Support\Facades\App;
+use Tests\TestCase;
 
 class MetricsServiceTest extends TestCase
 {
@@ -19,9 +20,12 @@ class MetricsServiceTest extends TestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
+
         // Use InMemory storage for testing
         $adapter = new InMemory();
         $this->metricsService = new MetricsService($adapter);
+        App::instance(MetricsService::class, $this->metricsService); // Replace the service in the container
     }
 
     /**