diff --git a/src/c/host-configs/quartz.cmake b/src/c/host-configs/quartz.cmake
new file mode 100644
index 00000000..5d9a2c36
--- /dev/null
+++ b/src/c/host-configs/quartz.cmake
@@ -0,0 +1,11 @@
+##############################################################
+# Copyright 2021 Lawrence Livermore National Security, LLC
+# (c.f. AUTHORS, NOTICE.LLNS, COPYING)
+#
+# This file is part of the Flux resource manager framework.
+# For details, see https://github.com/flux-framework.
+#
+# SPDX-License-Identifier: LGPL-3.0
+##############################################################
+
+set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-14.0.6/bin/clang++" CACHE PATH "")
diff --git a/src/c/test/CMakeLists.txt b/src/c/test/CMakeLists.txt
index 26f7fa05..2ab404f2 100644
--- a/src/c/test/CMakeLists.txt
+++ b/src/c/test/CMakeLists.txt
@@ -9,7 +9,8 @@ set(SMOKETESTS
 
 find_package(MPI REQUIRED)
 find_package(Threads REQUIRED)
-find_package(CUDA REQUIRED)
+#find_package(CUDA REQUIRED)
+find_package(CUDA)
 include_directories(${MPI_INCLUDE_PATH})
 
 set(perfflow_deps "-L../runtime -lperfflow_runtime -lcrypto")
@@ -25,17 +26,21 @@ foreach(TEST ${SMOKETESTS})
     target_link_libraries(${TEST} ${perfflow_deps})
 endforeach()
 
-message(STATUS " [*] Adding test: smoketest_cuda")
-set(CUDA_NVCC_FLAGS  "-ccbin ${CMAKE_CXX_COMPILER} -Xcompiler=-Xclang -Xcompiler=-load -Xcompiler=-Xclang -Xcompiler=../../../weaver/weave/libWeavePass.so")
-cuda_add_executable(smoketest_cuda smoketest_cuda_wrapper.cpp smoketest_cuda_kernel.cu)
-target_link_libraries(smoketest_cuda ${perfflow_deps} ${CUDA_LIBRARIES} cuda)
+IF(CUDA_FOUND)
+    message(STATUS " [*] Adding test: smoketest_cuda")
+    set(CUDA_NVCC_FLAGS  "-ccbin ${CMAKE_CXX_COMPILER} -Xcompiler=-Xclang -Xcompiler=-load -Xcompiler=-Xclang -Xcompiler=../../../weaver/weave/libWeavePass.so")
+    cuda_add_executable(smoketest_cuda smoketest_cuda_wrapper.cpp smoketest_cuda_kernel.cu)
+    target_link_libraries(smoketest_cuda ${perfflow_deps} ${CUDA_LIBRARIES} cuda)
+ENDIF()
 
 configure_file(t0001-cbinding-basic.t.in
     ${CMAKE_CURRENT_BINARY_DIR}/t0001-cbinding-basic.t
     @ONLY)
 
+IF(CUDA_FOUND)
 install(TARGETS ${SMOKETESTS} smoketest_cuda
         DESTINATION test)
+ENDIF()
 
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/t0001-cbinding-basic.t
         DESTINATION test)
diff --git a/src/python/test/smoketest.py b/src/python/test/smoketest.py
index ac632c80..24bd7073 100755
--- a/src/python/test/smoketest.py
+++ b/src/python/test/smoketest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import time
 import perfflowaspect