diff --git a/__tests__/unit/crypto/transactions/builders/transactions/htlc-claim.test.ts b/__tests__/unit/crypto/transactions/builders/transactions/htlc-claim.test.ts
index 0da284edb9..5a68308393 100644
--- a/__tests__/unit/crypto/transactions/builders/transactions/htlc-claim.test.ts
+++ b/__tests__/unit/crypto/transactions/builders/transactions/htlc-claim.test.ts
@@ -14,8 +14,7 @@ let builder: HtlcClaimBuilder;
 
 beforeEach(() => {
     // todo: completely wrap this into a function to hide the generation and setting of the config?
-    const config = Generators.generateCryptoConfigRaw();
-    configManager.setConfig(config);
+    configManager.setConfig(Generators.generateCryptoConfigRaw());
 
     builder = BuilderFactory.htlcClaim();
 });
diff --git a/__tests__/unit/crypto/transactions/builders/transactions/htlc-lock.test.ts b/__tests__/unit/crypto/transactions/builders/transactions/htlc-lock.test.ts
index 948901d16e..c1dc194698 100644
--- a/__tests__/unit/crypto/transactions/builders/transactions/htlc-lock.test.ts
+++ b/__tests__/unit/crypto/transactions/builders/transactions/htlc-lock.test.ts
@@ -1,21 +1,19 @@
 import "jest-extended";
 
-import { configManager } from "@packages/crypto/src/managers";
+import { Generators } from "@packages/core-test-framework/src";
 import { HtlcLockExpirationType, TransactionType } from "@packages/crypto/src/enums";
+import { configManager } from "@packages/crypto/src/managers";
 import { BuilderFactory } from "@packages/crypto/src/transactions";
 import { HtlcLockBuilder } from "@packages/crypto/src/transactions/builders/transactions/htlc-lock";
 import { Two } from "@packages/crypto/src/transactions/types";
 
-import { Generators } from "@packages/core-test-framework/src";
-
 const { EpochTimestamp } = HtlcLockExpirationType;
 
 let builder: HtlcLockBuilder;
 
 beforeEach(() => {
     // todo: completely wrap this into a function to hide the generation and setting of the config?
-    const config = Generators.generateCryptoConfigRaw();
-    configManager.setConfig(config);
+    configManager.setConfig(Generators.generateCryptoConfigRaw());
 
     builder = BuilderFactory.htlcLock();
 });
diff --git a/__tests__/unit/crypto/transactions/builders/transactions/htlc-refund.test.ts b/__tests__/unit/crypto/transactions/builders/transactions/htlc-refund.test.ts
index 83ad13b18b..01f0fc6f2c 100644
--- a/__tests__/unit/crypto/transactions/builders/transactions/htlc-refund.test.ts
+++ b/__tests__/unit/crypto/transactions/builders/transactions/htlc-refund.test.ts
@@ -1,20 +1,18 @@
 import "jest-extended";
 
-import { configManager } from "@packages/crypto/src/managers";
+import { Generators } from "@packages/core-test-framework/src";
 import { TransactionType } from "@packages/crypto/src/enums";
+import { configManager } from "@packages/crypto/src/managers";
 import { BuilderFactory } from "@packages/crypto/src/transactions";
 import { HtlcRefundBuilder } from "@packages/crypto/src/transactions/builders/transactions/htlc-refund";
 import { Two } from "@packages/crypto/src/transactions/types";
 import { BigNumber } from "@packages/crypto/src/utils";
 
-import { Generators } from "@packages/core-test-framework/src";
-
 let builder: HtlcRefundBuilder;
 
 beforeEach(() => {
     // todo: completely wrap this into a function to hide the generation and setting of the config?
-    const config = Generators.generateCryptoConfigRaw();
-    configManager.setConfig(config);
+    configManager.setConfig(Generators.generateCryptoConfigRaw());
 
     builder = BuilderFactory.htlcRefund();
 });
diff --git a/packages/core-test-framework/src/app/generators/crypto.ts b/packages/core-test-framework/src/app/generators/crypto.ts
index fe34b32a51..54dcdcbe8c 100644
--- a/packages/core-test-framework/src/app/generators/crypto.ts
+++ b/packages/core-test-framework/src/app/generators/crypto.ts
@@ -123,6 +123,7 @@ export class CryptoGenerator extends Generator {
                 vendorFieldLength: 64,
                 multiPaymentLimit: 256,
                 aip11: true,
+                htlcEnabled: true,
             },
             {
                 height: rewardHeight,