diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4de37d479d..ba0909d66c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,7 @@ option(DAWN_ENABLE_METAL "Enable compilation of the Metal backend" ${ENABLE_META
 option(DAWN_ENABLE_NULL "Enable compilation of the Null backend" ON)
 option(DAWN_ENABLE_OPENGL "Enable compilation of the OpenGL backend" ${ENABLE_OPENGL})
 option(DAWN_ENABLE_VULKAN "Enable compilation of the Vulkan backend" ${ENABLE_VULKAN})
-option(DAWN_ENABLE_WGSL "Enable WGSL support" OFF)
+option(DAWN_ENABLE_WGSL "Enable WGSL support" ON)
 option(DAWN_ALWAYS_ASSERT "Enable assertions on all build types" OFF)
 option(DAWN_USE_X11 "Enable support for X11 surface" ${USE_X11})
 
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index ac5449f74c..1169999f76 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -78,8 +78,9 @@ if (DAWN_BUILD_EXAMPLES)
     endif()
 endif()
 
-if (DAWN_BUILD_WGSL)
+if (DAWN_ENABLE_WGSL)
     if (NOT TARGET libtint)
+        set(TINT_BUILD_TESTS OFF CACHE BOOL "" FORCE)
         message(STATUS "Dawn: using Tint at ${DAWN_TINT_DIR}")
         add_subdirectory(${DAWN_TINT_DIR})
     endif()