diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
index 369a1cb699..3ed3e9b75d 100644
--- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
+++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
@@ -20,7 +20,6 @@
 !include UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
 
 [LibraryClasses]
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
   MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -33,8 +32,13 @@
   #
   # Build HOST_APPLICATION that tests the SampleUnitTest
   #
-  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf
-  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf {
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {
+    <LibraryClasses>
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
+  }
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {
+    <Defines>
+      FILE_GUID = 3604CCB8-138C-488F-8045-18704F73E734
     <LibraryClasses>
       OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
   }
diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
deleted file mode 100644
index 9d0fcfd357..0000000000
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
+++ /dev/null
@@ -1,56 +0,0 @@
-## @file
-# Host-based UnitTest for BaseCryptLib
-#
-# Copyright (c) Microsoft Corporation.<BR>
-# Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-
-[Defines]
-  INF_VERSION    = 0x00010005
-  BASE_NAME      = BaseCryptLibUnitTestHostAccel
-  FILE_GUID      = B1AED64E-B53A-4D69-B0BA-60EEDAC47A6B
-  MODULE_TYPE    = HOST_APPLICATION
-  VERSION_STRING = 1.0
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = IA32 X64
-#
-
-[Sources]
-  UnitTestMain.c
-  BaseCryptLibUnitTests.c
-  TestBaseCryptLib.h
-  HashTests.c
-  HmacTests.c
-  BlockCipherTests.c
-  RsaTests.c
-  RsaPkcs7Tests.c
-  Pkcs5Pbkdf2Tests.c
-  AuthenticodeTests.c
-  TSTests.c
-  DhTests.c
-  RandTests.c
-  Pkcs7EkuTests.c
-  OaepEncryptTests.c
-  RsaPssTests.c
-  ParallelhashTests.c
-  HkdfTests.c
-  AeadAesGcmTests.c
-  BnTests.c
-  EcTests.c
-  X509Tests.c
-
-[Packages]
-  MdePkg/MdePkg.dec
-  CryptoPkg/CryptoPkg.dec
-
-[LibraryClasses]
-  BaseLib
-  DebugLib
-  BaseCryptLib
-  UnitTestLib
-  MmServicesTableLib
-  SynchronizationLib