diff --git a/src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java b/src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java
index 2d44487e4..124aaea3d 100644
--- a/src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java
+++ b/src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java
@@ -1,18 +1,16 @@
 package cn.iocoder.dashboard.config;
 
 import org.mockito.Mockito;
-import org.quartz.impl.StdScheduler;
+import org.quartz.Scheduler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
 
 @Configuration
-@Lazy(false)
 public class QuartzTestConfiguration {
 
     @Bean
-    public StdScheduler scheduler() {
-        return Mockito.mock(StdScheduler.class);
+    public Scheduler scheduler() {
+        return Mockito.mock(Scheduler.class);
     }
 
 }
diff --git a/src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java b/src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java
index 904fd0a88..18b609f8e 100644
--- a/src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java
+++ b/src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Lazy;
 
 import java.io.IOException;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Lazy(false) // 禁用懒加载，因为需要保证 Redis Server 必须先启动
 @EnableConfigurationProperties(RedisProperties.class)
 @AutoConfigureBefore({RedisAutoConfiguration.class, RedissonAutoConfiguration.class}) // 在 Redis 自动配置前，进行初始化
@@ -32,6 +32,7 @@ public class RedisTestConfiguration {
     @Bean(destroyMethod = "stop")
     public RedisServer redisServer(RedisProperties properties) throws IOException {
         RedisServer redisServer = new RedisServer(properties.getPort());
+        // TODO 芋艿：一次执行多个单元测试时，貌似创建多个 spring 容器，导致不进行 stop。这样，就导致端口被占用，无法启动。。。
         try {
             redisServer.start();
         } catch (Exception ignore) {}
diff --git a/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java b/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java
index 57503ff40..1b7e1f283 100644
--- a/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java
+++ b/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java
@@ -1,25 +1,20 @@
 package cn.iocoder.dashboard.modules.tool.dal.mysql.codegen;
 
+import cn.iocoder.dashboard.BaseSpringBootUnitTest;
 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.jdbc.Sql;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@SpringBootTest
-@ActiveProfiles("unit-test")
-public class ToolInformationSchemaColumnMapperTest {
+public class ToolInformationSchemaColumnMapperTest extends BaseSpringBootUnitTest {
 
     @Resource
     private ToolSchemaColumnMapper toolInformationSchemaColumnMapper;
 
     @Test
-    @Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
     public void testSelectListByTableName() {
         List<ToolSchemaColumnDO> columns = toolInformationSchemaColumnMapper
                 .selectListByTableName("inf_config");
diff --git a/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java b/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java
index 6f48cc326..ff488972c 100644
--- a/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java
+++ b/src/test/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java
@@ -1,16 +1,15 @@
 package cn.iocoder.dashboard.modules.tool.dal.mysql.codegen;
 
+import cn.iocoder.dashboard.BaseSpringBootUnitTest;
 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@SpringBootTest
-class ToolInformationSchemaTableMapperTest {
+class ToolInformationSchemaTableMapperTest extends BaseSpringBootUnitTest {
 
     @Resource
     private ToolSchemaTableMapper toolInformationSchemaTableMapper;
diff --git a/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngineTest.java b/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngineTest.java
index 6231bc2eb..e415b4f84 100644
--- a/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngineTest.java
+++ b/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngineTest.java
@@ -1,5 +1,6 @@
 package cn.iocoder.dashboard.modules.tool.service.codegen.impl;
 
+import cn.iocoder.dashboard.BaseSpringBootUnitTest;
 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
 import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolCodegenColumnMapper;
@@ -11,8 +12,7 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
-@SpringBootTest
-public class ToolCodegenEngineTest {
+public class ToolCodegenEngineTest extends BaseSpringBootUnitTest {
 
     @Resource
     private ToolCodegenTableMapper codegenTableMapper;
diff --git a/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParserTest.java b/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParserTest.java
index 0e91b8ecb..1c331dfdf 100644
--- a/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParserTest.java
+++ b/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParserTest.java
@@ -1,10 +1,9 @@
 package cn.iocoder.dashboard.modules.tool.service.codegen.impl;
 
+import cn.iocoder.dashboard.BaseSpringBootUnitTest;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
-class ToolCodegenSQLParserTest {
+public class ToolCodegenSQLParserTest extends BaseSpringBootUnitTest {
 
     @Test
     public void testParse() {
diff --git a/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImplTest.java b/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImplTest.java
index 94c8a2b51..603ae9a47 100644
--- a/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImplTest.java
+++ b/src/test/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImplTest.java
@@ -1,12 +1,12 @@
 package cn.iocoder.dashboard.modules.tool.service.codegen.impl;
 
+import cn.iocoder.dashboard.BaseSpringBootUnitTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
 
-@SpringBootTest
-class ToolCodegenServiceImplTest {
+class ToolCodegenServiceImplTest extends BaseSpringBootUnitTest {
 
     @Resource
     private ToolCodegenServiceImpl toolCodegenService;
diff --git a/src/test/resources/application-unit-test.yaml b/src/test/resources/application-unit-test.yaml
index 9472c2fc2..e402c29e8 100644
--- a/src/test/resources/application-unit-test.yaml
+++ b/src/test/resources/application-unit-test.yaml
@@ -31,7 +31,7 @@ spring:
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: 127.0.0.1 # 地址
-    port: 36379 # 端口（单元测试，使用 363979 端口）
+    port: 16379 # 端口（单元测试，使用 16379 端口）
     database: 0 # 数据库索引
 
 --- #################### 定时任务相关配置 ####################