diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 9793facf03..8bdb71d556 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -214,6 +214,9 @@ devicenameresolver:x64-windows-static=fail
 dimcli:arm-uwp=fail
 dimcli:x64-osx=fail
 dimcli:x64-uwp=fail
+# legacy directxsdk which conflicts with dxsdk-d3dx
+directxsdk:x86-windows=skip
+directxsdk:x64-windows=skip
 discord-game-sdk:x64-windows-static=fail
 discord-game-sdk:x64-windows-static-md=fail
 discord-rpc:arm-uwp=fail
@@ -271,6 +274,8 @@ elfutils:x64-osx=fail
 # https://github.com/embree/embree/issues/331
 embree2:x64-windows-static=skip
 embree2:x64-windows-static-md=skip
+# embree2 conflicts with embree3 on Linux
+embree2:x64-linux=skip
 enet:arm-uwp=fail
 enet:x64-uwp=fail
 epsilon:arm-uwp=fail