diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFactoryTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java
similarity index 95%
rename from src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFactoryTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java
index 77ef5496c..2d7eae6f4 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFactoryTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java
@@ -1,9 +1,8 @@
-package com.mageddo.dnsproxyserver.solver.remote.application;
+package com.mageddo.dnsproxyserver.solver.remote.application.failsafe;
 
 import com.mageddo.commons.circuitbreaker.CircuitCheckException;
 import com.mageddo.commons.concurrent.Threads;
 import com.mageddo.dnsproxyserver.solver.remote.Result;
-import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerFactory;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFailSafeServiceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFailSafeServiceCompTest.java
similarity index 93%
rename from src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFailSafeServiceCompTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFailSafeServiceCompTest.java
index 66d6b0064..2ad265cd6 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFailSafeServiceCompTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFailSafeServiceCompTest.java
@@ -1,9 +1,8 @@
-package com.mageddo.dnsproxyserver.solver.remote.application;
+package com.mageddo.dnsproxyserver.solver.remote.application.failsafe;
 
 import com.mageddo.commons.circuitbreaker.CircuitCheckException;
 import com.mageddo.dnsproxyserver.solver.remote.Request;
 import com.mageddo.dnsproxyserver.solver.remote.Result;
-import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerFailSafeService;
 import com.mageddo.dnsproxyserver.solver.remote.dataprovider.SolverConsistencyGuaranteeDAO;
 import dagger.sheath.InjectMock;
 import dagger.sheath.junit.DaggerTest;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerPingCheckerServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerServiceTest.java
similarity index 93%
rename from src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerPingCheckerServiceTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerServiceTest.java
index a6086f9bc..2152148f0 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerPingCheckerServiceTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerServiceTest.java
@@ -1,7 +1,6 @@
-package com.mageddo.dnsproxyserver.solver.remote.application;
+package com.mageddo.dnsproxyserver.solver.remote.application.failsafe;
 
 import com.mageddo.dnsproxyserver.solver.remote.Result;
-import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerPingCheckerService;
 import com.mageddo.net.SocketUtils;
 import dev.failsafe.CircuitBreaker;
 import org.junit.jupiter.api.Test;