diff --git a/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java b/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java
index d53de6a25c4592c2da88948fe1209a65c436432c..c214cf0614072c0e504daaad158d705da817de6b 100644
--- a/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java
+++ b/car/src/test/java/cz/muni/pa165/car/rest/CarComponentPairControllerTest.java
@@ -1,28 +1,29 @@
 package cz.muni.pa165.car.rest;
 
-import static org.mockito.BDDMockito.given;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import cz.muni.pa165.car.restemplate.DbGetter;
 import cz.muni.pa165.car.service.CarComponentPairService;
 import cz.muni.pa165.common_library.dtos.CarComponentResponseDto;
 import cz.muni.pa165.common_library.dtos.CarResponseDto;
-import java.math.BigDecimal;
-import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import static org.mockito.BDDMockito.given;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Bean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.math.BigDecimal;
+import java.util.List;
 
 @WebMvcTest(CarComponentPairController.class)
-@Import(TestConfig.class)
 public class CarComponentPairControllerTest {
 
   private static CarResponseDto carResponseDto;
@@ -36,6 +37,16 @@ public class CarComponentPairControllerTest {
   @Autowired
   private ObjectMapper objectMapper;
 
+  @TestConfiguration
+  static class TestConfig {
+
+    @Bean
+    DbGetter dbGetter() {
+      return new DbGetter();
+    }
+
+  }
+
   @BeforeEach
   void initializeTestObjects() {
 
diff --git a/car/src/test/java/cz/muni/pa165/car/rest/TestConfig.java b/car/src/test/java/cz/muni/pa165/car/rest/TestConfig.java
deleted file mode 100644
index f34d68da5a5b02a2e9dfe5e79f5d64c305115443..0000000000000000000000000000000000000000
--- a/car/src/test/java/cz/muni/pa165/car/rest/TestConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cz.muni.pa165.car.rest;
-
-import cz.muni.pa165.car.restemplate.DbGetter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class TestConfig {
-
-  @Bean
-  DbGetter dbGetter() {
-    return new DbGetter();
-  }
-}
diff --git a/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java b/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java
index 13072e2e9858a9356892821c43041d914126dc04..5b588258c99e7f467bbc62acfa66ce517d3035ce 100644
--- a/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java
+++ b/car/src/test/java/cz/muni/pa165/car/service/CarServiceTests.java
@@ -8,7 +8,6 @@ import cz.muni.pa165.common_library.dtos.CarComponentResponseDto;
 import cz.muni.pa165.common_library.dtos.CarRequestDto;
 import cz.muni.pa165.common_library.dtos.CarResponseDto;
 import cz.muni.pa165.common_library.dtos.DriverInsightDto;
-import cz.muni.pa165.common_library.dtos.DriverResponseDto;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -30,8 +29,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-@SpringBootTest
-@AutoConfigureMockMvc
+@SpringBootTest()
+@AutoConfigureMockMvc()
 public class CarServiceTests {
 
   @Autowired