diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fcbfc43..eb60ea3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -165,11 +165,7 @@ jobs:
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . --config Release -- -m:2
-            # TODO(https://github.com/google/draco/issues/826)
-            draco_test_command: |-
-              Release/draco_tests \
-                --gtest_filter=-GltfDecoderTest.ThreeMeshesOneNoMaterialMesh
-
+            draco_test_command: Release/draco_tests
 
           - test_name: windows-msvc-release-static
             os: windows-2019
@@ -189,11 +185,7 @@ jobs:
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . --config Release -- -m:2
-            # TODO(https://github.com/google/draco/issues/826)
-            draco_test_command: |-
-              Release/draco_tests \
-                --gtest_filter=-GltfDecoderTest.ThreeMeshesOneNoMaterialMesh
-
+            draco_test_command: Release/draco_tests
 
           - test_name: windows-make-release-shared
             os: windows-2019
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e551901..ca5452f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -862,6 +862,13 @@ else()
                     ${draco_include_paths})
 
   if(DRACO_TRANSCODER_SUPPORTED)
+    if(MSVC)
+      # TODO(https://github.com/google/draco/issues/826)
+      set_source_files_properties(
+        "${draco_src_root}/io/gltf_decoder.cc"
+        PROPERTIES COMPILE_OPTIONS "/Od")
+    endif()
+
     draco_add_library(
       NAME
       draco_material