diff --git a/tests/scripts/run_cpp_unit_tests.sh b/tests/scripts/run_cpp_unit_tests.sh
index d614c9954f0..c275648f517 100755
--- a/tests/scripts/run_cpp_unit_tests.sh
+++ b/tests/scripts/run_cpp_unit_tests.sh
@@ -14,7 +14,7 @@ if [[ ! -z "$TT_METAL_SLOW_DISPATCH_MODE" ]]; then
 else
     ./build/test/tt_metal/unit_tests_fast_dispatch
     if [[ "$ARCH_NAME" == "wormhole_b0" ]]; then
-        WH_ARCH_YAML=wormhole_b0_80_arch_eth_dispatch.yaml ./build/test/tt_metal/unit_tests_fast_dispatch --gtest_filter="-*WatcherFixture.*:*DPrintFixture.*:*DPrintErrorChecking.*:*DPrintFixtureDisableDevices.*"
+        WH_ARCH_YAML=wormhole_b0_80_arch_eth_dispatch.yaml ./build/test/tt_metal/unit_tests_fast_dispatch
     fi
     env python tests/scripts/run_tt_eager.py --dispatch-mode fast
     env python tests/scripts/run_tt_metal.py --dispatch-mode fast
diff --git a/tests/tt_metal/tt_metal/unit_tests_common/common/dprint_fixture.hpp b/tests/tt_metal/tt_metal/unit_tests_common/common/dprint_fixture.hpp
index 3a013455535..bee93f0fa7a 100644
--- a/tests/tt_metal/tt_metal/unit_tests_common/common/dprint_fixture.hpp
+++ b/tests/tt_metal/tt_metal/unit_tests_common/common/dprint_fixture.hpp
@@ -4,6 +4,7 @@
 
 #include "common_fixture.hpp"
 #include "impl/debug/dprint_server.hpp"
+#include "tt_metal/common/core_descriptor.hpp"
 
 // A version of CommonFixture with DPrint enabled on all cores.
 class DPrintFixture: public CommonFixture {
@@ -36,8 +37,10 @@ class DPrintFixture: public CommonFixture {
         int num_cqs = (num_cqs_str != nullptr)? std::stoi(num_cqs_str) : 1;
         std::map<CoreType, std::unordered_set<CoreCoord>> disabled;
         for (unsigned int id = 0; id < tt::tt_metal::GetNumAvailableDevices(); id++) {
+            // TODO: Better way to get this info once we've solidified how it will be set.
+            const tt::core_descriptor_t &core_desc = tt::get_core_descriptor_config(id, num_cqs);
             for (auto core : tt::get_logical_dispatch_cores(id, num_cqs)) {
-                disabled[CoreType::WORKER].insert(core);
+                disabled[core_desc.dispatch_core_type].insert(core);
             }
         }
         tt::llrt::OptionsG.set_dprint_disabled_cores(disabled);
diff --git a/tests/tt_metal/tt_metal/unit_tests_common/watcher/test_waypoint.cpp b/tests/tt_metal/tt_metal/unit_tests_common/watcher/test_waypoint.cpp
index b4068edf152..ea8b4c30d94 100644
--- a/tests/tt_metal/tt_metal/unit_tests_common/watcher/test_waypoint.cpp
+++ b/tests/tt_metal/tt_metal/unit_tests_common/watcher/test_waypoint.cpp
@@ -173,8 +173,6 @@ static void RunTest(WatcherFixture* fixture, Device* device) {
 }
 
 TEST_F(WatcherFixture, TestWatcherWaypoints) {
-    // TODO: Re-enable with #7329
-    GTEST_SKIP();
     for (Device* device : this->devices_) {
         this->RunTestOnDevice(RunTest, device);
     }
diff --git a/tt_metal/hw/inc/wormhole/dev_mem_map.h b/tt_metal/hw/inc/wormhole/dev_mem_map.h
index 7efe1b93fda..2f0f7910a16 100644
--- a/tt_metal/hw/inc/wormhole/dev_mem_map.h
+++ b/tt_metal/hw/inc/wormhole/dev_mem_map.h
@@ -45,7 +45,7 @@
 #define MEM_BOOT_CODE_SIZE             4
 #define MEM_BRISC_FIRMWARE_SIZE        (10 * 1024)
 #define MEM_NCRISC_FIRMWARE_SIZE       (16 * 1024)
-#define MEM_IERISC_FIRMWARE_SIZE       (10 * 1024)
+#define MEM_IERISC_FIRMWARE_SIZE       (16 * 1024)
 #define MEM_TRISC0_SIZE                (16 * 1024)
 #define MEM_TRISC1_SIZE                (16 * 1024)
 #define MEM_TRISC2_SIZE                (16 * 1024)