diff --git a/services/local_code_sign/src/local_code_sign_service.cpp b/services/local_code_sign/src/local_code_sign_service.cpp
index 243d1ac3b8a47a16bd47575462d30327e0aba77c..d518c1978ee4ffcd77c717807e8590247df754ec 100644
--- a/services/local_code_sign/src/local_code_sign_service.cpp
+++ b/services/local_code_sign/src/local_code_sign_service.cpp
@@ -93,6 +93,10 @@ void LocalCodeSignService::DelayUnloadTask()
 void LocalCodeSignService::OnStop()
 {
     LOG_INFO("LocalCodeSignService OnStop");
+    if (unloadHandler_ != nullptr) {
+        unloadHandler_->RemoveTask(TASK_ID);
+        unloadHandler_ = nullptr;
+    }
     state_ = ServiceRunningState::STATE_NOT_START;
 }
 
diff --git a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp
index e4bfcdd23c00e8a176b0a69c3b7f2144d37a6f53..7405cbd6ac9708c02529ca496f2ee9d89e738f47 100644
--- a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp
+++ b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp
@@ -59,6 +59,7 @@ namespace OHOS {
         uint64_t selfTokenId = NativeTokenSet("key_enable");
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStart();
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnRemoteRequest(code, datas, reply, option);
+        DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStop();
         NativeTokenReset(selfTokenId);
         return true;
     }
diff --git a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp
index f3778ae53f7f5cab4dc406f0938defca86fb0666..f7583a2e6f4e0990a1440770afefccf6d524f295 100644
--- a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp
+++ b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp
@@ -59,6 +59,7 @@ namespace OHOS {
         uint64_t selfTokenId = NativeTokenSet("compiler_service");
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStart();
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnRemoteRequest(code, datas, reply, option);
+        DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStop();
         NativeTokenReset(selfTokenId);
         return true;
     }
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index abdcf5117bae25fb60e83cc8c477e2a889398a37..3da8fb1a3649bc43f5fc39cbc309bbd2b5e7a38e 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -64,8 +64,12 @@ ohos_unittest("code_sign_utils_unittest") {
     "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils",
   ]
 
+  defines = []
   if (!is_asan && !use_clang_coverage) {
-    defines = [ "NO_USE_CLANG_COVERAGE" ]
+    defines += [ "NO_USE_CLANG_COVERAGE" ]
+  }
+  if (code_signature_support_oh_code_sign) {
+    defines += [ "SUPPORT_OH_CODE_SIGN" ]
   }
 
   include_dirs = [