diff --git a/glue-codes/openfast/CMakeLists.txt b/glue-codes/openfast/CMakeLists.txt
index a22cbde0a..bc2e13233 100644
--- a/glue-codes/openfast/CMakeLists.txt
+++ b/glue-codes/openfast/CMakeLists.txt
@@ -33,12 +33,12 @@ endif()
 install(TARGETS openfast
   RUNTIME DESTINATION bin)
 
-if(BUILD_OPENFAST_CPP_API AND BUILD_OPENFAST_CPP_DRIVER)
+if(BUILD_OPENFAST_CPP_DRIVER)
   add_executable(openfast_cpp_driver src/FAST_Prog.cpp src/FastLibAPI.cpp)
   target_link_libraries(openfast_cpp_driver openfastlib)
   
   install(TARGETS openfast_cpp_driver
     RUNTIME DESTINATION bin)
-endif(BUILD_OPENFAST_CPP_API AND BUILD_OPENFAST_CPP_DRIVER)
+endif()
 
 
diff --git a/reg_tests/CMakeLists.txt b/reg_tests/CMakeLists.txt
index 268e188f9..70cbf6717 100644
--- a/reg_tests/CMakeLists.txt
+++ b/reg_tests/CMakeLists.txt
@@ -42,7 +42,7 @@ option(CTEST_NO_RUN_FLAG  "Complete the regression test comparison but do not ex
 # Set the OpenFAST executable configuration option and default
 set(CTEST_OPENFAST_EXECUTABLE "${CMAKE_BINARY_DIR}/glue-codes/openfast/openfast${CMAKE_EXECUTABLE_SUFFIX}" CACHE FILEPATH "Specify the OpenFAST executable to use in testing.")
 
-if(BUILD_OPENFAST_CPP_API)
+if(BUILD_OPENFAST_CPP_DRIVER)
   # Set the OpenFAST executable configuration option and default
   set(CTEST_OPENFASTCPP_EXECUTABLE "${CMAKE_BINARY_DIR}/glue-codes/openfast-cpp/openfastcpp${CMAKE_EXECUTABLE_SUFFIX}" CACHE FILEPATH "Specify the OpenFAST C++ executable to use in testing.")
 endif()
diff --git a/reg_tests/CTestList.cmake b/reg_tests/CTestList.cmake
index 8aa86ae6e..7fda42b58 100644
--- a/reg_tests/CTestList.cmake
+++ b/reg_tests/CTestList.cmake
@@ -285,7 +285,7 @@ of_regression("MHK_RM1_Floating"                       "openfast;elastodyn;aerod
 of_regression("Tailfin_FreeYaw1DOF_PolarBased"         "openfast;elastodyn;aerodyn15")
 
 # OpenFAST C++ API test
-if(BUILD_OPENFAST_CPP_API)
+if(BUILD_OPENFAST_CPP_DRIVER)
   of_cpp_interface_regression("5MW_Land_DLL_WTurb_cpp" "openfast;fastlib;cpp")
 endif()