diff --git a/tests/config_test.go b/tests/config_test.go
index 5568207..7898b24 100644
--- a/tests/config_test.go
+++ b/tests/config_test.go
@@ -79,9 +79,7 @@ func testVideoPlayback(t *testing.T, videoPath string) {
 
 func TestModuleConfiguration(t *testing.T) {
 	fullModuleBinPath, err := getModuleBinPath()
-	if err != nil {
-		t.Fatalf("Failed to get module binary path: %v", err)
-	}
+	test.That(t, err, test.ShouldBeNil)
 
 	// Full configuration
 	config1 := fmt.Sprintf(`
diff --git a/tests/fetch_test.go b/tests/fetch_test.go
index cb40e34..4a303ea 100644
--- a/tests/fetch_test.go
+++ b/tests/fetch_test.go
@@ -14,13 +14,9 @@ import (
 func TestFetchDoCommand(t *testing.T) {
 	storageRelativePath := "./video-storage"
 	storagePath, err := filepath.Abs(storageRelativePath)
-	if err != nil {
-		t.Fatalf("Failed to get absolute path: %v", err)
-	}
+	test.That(t, err, test.ShouldBeNil)
 	fullModuleBinPath, err := getModuleBinPath()
-	if err != nil {
-		t.Fatalf("Failed to get module bin path: %v", err)
-	}
+	test.That(t, err, test.ShouldBeNil)
 
 	config1 := fmt.Sprintf(`
 	{