diff --git a/.github/workflows/sv-tests-ci.yml b/.github/workflows/sv-tests-ci.yml
index bd2fb7042ee61..0d694456caceb 100644
--- a/.github/workflows/sv-tests-ci.yml
+++ b/.github/workflows/sv-tests-ci.yml
@@ -52,7 +52,7 @@ jobs:
             deps: haskell-stack
           - name: yosys-slang
             deps: bison clang tcl-dev flex libfl-dev pkg-config libreadline-dev cmake pkg-config
-            submodules: slang
+            submodules: third_party/slang
     env:
       RUNNERS_FILTER: ${{ matrix.tool.runners_filter }}
       CCACHE_DIR: "/root/sv-tests/sv-tests/.cache/"
diff --git a/README.md b/README.md
index 2079d71a83a40..089197eb749d1 100644
--- a/README.md
+++ b/README.md
@@ -106,3 +106,4 @@ Finally the file containing the test case and metadata should be placed in `test
 * [sv-parser](https://github.com/dalance/sv-parser)
 * [moore](http://llhd.io)
 * [verible](https://github.com/google/verible)
+* [yosys-slang](https://github.com/povik/yosys-slang)
diff --git a/third_party/tools/yosys b/third_party/tools/yosys
index 18cec2d9a926c..80ba43d262647 160000
--- a/third_party/tools/yosys
+++ b/third_party/tools/yosys
@@ -1 +1 @@
-Subproject commit 18cec2d9a926c98bfadeffc47d38213139e188a7
+Subproject commit 80ba43d26264738c93900129dc0aab7fab36c53f
diff --git a/third_party/tools/yosys-slang b/third_party/tools/yosys-slang
index e6896336e46a7..5ee7dbcf4f6a1 160000
--- a/third_party/tools/yosys-slang
+++ b/third_party/tools/yosys-slang
@@ -1 +1 @@
-Subproject commit e6896336e46a7722d3d56fc1cb80d8af9252022b
+Subproject commit 5ee7dbcf4f6a15ff6d5e2d964a5bd73f082588b1
diff --git a/tools/runners.mk b/tools/runners.mk
index 3e2397b202ed6..56de0f1b4fcbb 100644
--- a/tools/runners.mk
+++ b/tools/runners.mk
@@ -129,8 +129,7 @@ $(INSTALL_DIR)/bin/verilog_syntax: verible
 yosys-slang: $(INSTALL_DIR)/bin/yosys-slang
 
 $(INSTALL_DIR)/bin/slang-yosys $(INSTALL_DIR)/bin/slang-yosys-config:
-	# TODO: set to CXXSTD=c++20 to match slang once yosys upstream issues are resolved
-	$(MAKE) -C $(RDIR)/yosys CONFIG=gcc CXXSTD=c++11 ENABLE_ABC=0 \
+	$(MAKE) -C $(RDIR)/yosys CONFIG=gcc CXXSTD=c++20 ENABLE_ABC=0 \
 				PROGRAM_PREFIX=slang- PREFIX=$(INSTALL_DIR) install
 
 $(INSTALL_DIR)/bin/yosys-slang: $(INSTALL_DIR)/bin/slang-yosys-config