diff --git a/unittests/BCGen/HBC.cpp b/unittests/BCGen/HBC.cpp
index 21d6a525763..e49104314b5 100644
--- a/unittests/BCGen/HBC.cpp
+++ b/unittests/BCGen/HBC.cpp
@@ -515,12 +515,12 @@ TEST(HBCBytecodeGen, BytecodeFieldsFail) {
 }
 
 TEST(HBCBytecodeGen, SerializeBytecodeOptions) {
-  TestCompileFlags flags;
-  flags.staticBuiltins = false;
-  auto bytecodeVecDefault = bytecodeForSource("print('hello world');", flags);
-  flags.staticBuiltins = true;
+  BytecodeGenerationOptions opts = BytecodeGenerationOptions::defaults();
+  opts.staticBuiltinsEnabled = false;
+  auto bytecodeVecDefault = bytecodeForSource("print('hello world');", opts);
+  opts.staticBuiltinsEnabled = true;
   auto bytecodeVecStaticBuiltins =
-      bytecodeForSource("print('hello world');", flags);
+      bytecodeForSource("print('hello world');", opts);
 
   auto bytecodeDefault = hbc::BCProviderFromBuffer::createBCProviderFromBuffer(
                              std::make_unique<VectorBuffer>(bytecodeVecDefault))
diff --git a/unittests/BCGen/TestHelpers.cpp b/unittests/BCGen/TestHelpers.cpp
index e25d084610b..b1539a71259 100644
--- a/unittests/BCGen/TestHelpers.cpp
+++ b/unittests/BCGen/TestHelpers.cpp
@@ -7,12 +7,10 @@
 
 #include "TestHelpers.h"
 #include "hermes/AST/SemValidate.h"
-#include "hermes/BCGen/HBC/HBC.h"
 #include "hermes/BCGen/HBC/TraverseLiteralStrings.h"
 #include "hermes/BCGen/HBC/UniquingStringLiteralTable.h"
 #include "hermes/IRGen/IRGen.h"
 #include "hermes/Parser/JSParser.h"
-#include "hermes/Utils/Options.h"
 #include "llvh/Support/SHA1.h"
 
 #include "gtest/gtest.h"
@@ -20,17 +18,17 @@
 using namespace hermes;
 using namespace hermes::hbc;
 
-/// Compile source code \p source into Hermes bytecode.
-/// \return the bytecode as a vector of bytes.
-std::vector<uint8_t> hermes::bytecodeForSource(
+/// Compile source code \p source into Hermes bytecode module.
+/// \return the bytecode module.
+std::unique_ptr<BytecodeModule> hermes::bytecodeModuleForSource(
     const char *source,
-    TestCompileFlags flags) {
+    BytecodeGenerationOptions opts) {
   /* Parse source */
   SourceErrorManager sm;
   CodeGenerationSettings codeGenOpts;
   codeGenOpts.unlimitedRegisters = false;
   OptimizationSettings optSettings;
-  optSettings.staticBuiltins = flags.staticBuiltins;
+  optSettings.staticBuiltins = opts.staticBuiltinsEnabled;
   auto context = std::make_shared<Context>(sm, codeGenOpts, optSettings);
   parser::JSParser jsParser(*context, source);
   auto parsed = jsParser.parse();
@@ -47,16 +45,23 @@ std::vector<uint8_t> hermes::bytecodeForSource(
   hermes::generateIRFromESTree(ast, &M, declFileList, {});
 
   /* Generate bytecode module */
-  auto bytecodeGenOpts = BytecodeGenerationOptions::defaults();
-  bytecodeGenOpts.staticBuiltinsEnabled = flags.staticBuiltins;
-  auto BM =
-      generateBytecodeModule(&M, M.getTopLevelFunction(), bytecodeGenOpts);
+  auto BM = generateBytecodeModule(&M, M.getTopLevelFunction(), opts);
   assert(BM != nullptr && "Failed to generate bytecode module");
 
+  return BM;
+}
+
+/// Compile source code \p source into Hermes bytecode.
+/// \return the bytecode as a vector of bytes.
+std::vector<uint8_t> hermes::bytecodeForSource(
+    const char *source,
+    BytecodeGenerationOptions opts) {
+  auto BM = bytecodeModuleForSource(source, opts);
+
   /* Serialize it */
   llvh::SmallVector<char, 0> bytecodeVector;
   llvh::raw_svector_ostream OS(bytecodeVector);
-  BytecodeSerializer BS{OS, bytecodeGenOpts};
+  BytecodeSerializer BS{OS, opts};
   BS.serialize(
       *BM,
       llvh::SHA1::hash(llvh::ArrayRef<uint8_t>{
diff --git a/unittests/BCGen/TestHelpers.h b/unittests/BCGen/TestHelpers.h
index ddd79a65b7e..4fed7704755 100644
--- a/unittests/BCGen/TestHelpers.h
+++ b/unittests/BCGen/TestHelpers.h
@@ -12,19 +12,22 @@
 
 #include <stdint.h>
 #include <vector>
+#include "hermes/BCGen/HBC/HBC.h"
 #include "llvh/ADT/SmallVector.h"
 
 namespace hermes {
 
-struct TestCompileFlags {
-  bool staticBuiltins{false};
-};
+/// Compile source code \p source into Hermes bytecode module, asserting that it
+/// can be compiled successfully. \return the bytecode module.
+std::unique_ptr<hbc::BytecodeModule> bytecodeModuleForSource(
+    const char *source,
+    BytecodeGenerationOptions opts = BytecodeGenerationOptions::defaults());
 
 /// Compile source code \p source into Hermes bytecode, asserting that it can be
 /// compiled successfully. \return the bytecode as a vector of bytes.
 std::vector<uint8_t> bytecodeForSource(
     const char *source,
-    TestCompileFlags flags = TestCompileFlags());
+    BytecodeGenerationOptions opts = BytecodeGenerationOptions::defaults());
 
 } // namespace hermes