diff --git a/examples/wireless/wifi-simple-ht-hidden-stations.cc b/examples/wireless/wifi-simple-ht-hidden-stations.cc
index d14f9a7fc..fd779b3be 100644
--- a/examples/wireless/wifi-simple-ht-hidden-stations.cc
+++ b/examples/wireless/wifi-simple-ht-hidden-stations.cc
@@ -66,7 +66,7 @@ main(int argc, char* argv[])
     double maxExpectedThroughput{0};
 
     RngSeedManager::SetSeed(1);
-    RngSeedManager::SetRun(1);
+    RngSeedManager::SetRun(7);
 
     CommandLine cmd(__FILE__);
     cmd.AddValue("nMpdus", "Number of aggregated MPDUs", nMpdus);
diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
index 5954a5cbb..cfc1547f5 100644
--- a/src/wifi/model/ap-wifi-mac.cc
+++ b/src/wifi/model/ap-wifi-mac.cc
@@ -341,6 +341,7 @@ ApWifiMac::AssignStreams(int64_t stream)
     NS_LOG_FUNCTION(this << stream);
     m_beaconJitter->SetStream(stream);
     auto currentStream = stream + 1;
+    currentStream += m_beaconTxop->AssignStreams(currentStream);
     currentStream += WifiMac::AssignStreams(currentStream);
     return (currentStream - stream);
 }
diff --git a/src/wifi/test/inter-bss-test-suite.cc b/src/wifi/test/inter-bss-test-suite.cc
index 20071e31a..fd5d8edff 100644
--- a/src/wifi/test/inter-bss-test-suite.cc
+++ b/src/wifi/test/inter-bss-test-suite.cc
@@ -339,17 +339,17 @@ TestInterBssConstantObssPdAlgo::SetupSimulation()
                         ap_device2,
                         WifiPhyState::TX);
     // All other PHYs should have stay idle until 4us (preamble detection time).
-    Simulator::Schedule(Seconds(2.0) + MicroSeconds(13),
+    Simulator::Schedule(Seconds(2.0) + MicroSeconds(11),
                         &TestInterBssConstantObssPdAlgo::CheckPhyState,
                         this,
                         sta_device1,
                         WifiPhyState::IDLE);
-    Simulator::Schedule(Seconds(2.0) + MicroSeconds(13),
+    Simulator::Schedule(Seconds(2.0) + MicroSeconds(11),
                         &TestInterBssConstantObssPdAlgo::CheckPhyState,
                         this,
                         sta_device2,
                         WifiPhyState::IDLE);
-    Simulator::Schedule(Seconds(2.0) + MicroSeconds(13),
+    Simulator::Schedule(Seconds(2.0) + MicroSeconds(11),
                         &TestInterBssConstantObssPdAlgo::CheckPhyState,
                         this,
                         ap_device1,