diff --git a/src/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/aodv/test/aodv-chain-regression-test-0-0.pcap
index 16c556e64..56b45336e 100644
Binary files a/src/aodv/test/aodv-chain-regression-test-0-0.pcap and b/src/aodv/test/aodv-chain-regression-test-0-0.pcap differ
diff --git a/src/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/aodv/test/aodv-chain-regression-test-1-0.pcap
index 3822daf39..020e153c2 100644
Binary files a/src/aodv/test/aodv-chain-regression-test-1-0.pcap and b/src/aodv/test/aodv-chain-regression-test-1-0.pcap differ
diff --git a/src/aodv/test/aodv-chain-regression-test-2-0.pcap b/src/aodv/test/aodv-chain-regression-test-2-0.pcap
index 926a95fcf..9c83ba2a5 100644
Binary files a/src/aodv/test/aodv-chain-regression-test-2-0.pcap and b/src/aodv/test/aodv-chain-regression-test-2-0.pcap differ
diff --git a/src/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/aodv/test/aodv-chain-regression-test-3-0.pcap
index 11f17e08a..7f301f78e 100644
Binary files a/src/aodv/test/aodv-chain-regression-test-3-0.pcap and b/src/aodv/test/aodv-chain-regression-test-3-0.pcap differ
diff --git a/src/aodv/test/aodv-chain-regression-test-4-0.pcap b/src/aodv/test/aodv-chain-regression-test-4-0.pcap
index 5f1cfbf52..ea1b6aa36 100644
Binary files a/src/aodv/test/aodv-chain-regression-test-4-0.pcap and b/src/aodv/test/aodv-chain-regression-test-4-0.pcap differ
diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc
index a7706e9ce..e61e37784 100644
--- a/src/aodv/test/aodv-regression.cc
+++ b/src/aodv/test/aodv-regression.cc
@@ -133,24 +133,35 @@ void
 ChainRegressionTest::CreateDevices ()
 {
   // 1. Setup WiFi
+  int64_t streamsUsed = 0;
   NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
   wifiMac.SetType ("ns3::AdhocWifiMac");
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
-  wifiPhy.SetChannel (wifiChannel.Create ());
+  Ptr<YansWifiChannel> chan = wifiChannel.Create ();
+  wifiPhy.SetChannel (chan);
   // This test suite output was originally based on YansErrorRateModel
   wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); 
   WifiHelper wifi = WifiHelper::Default ();
   wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"));
   NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes); 
 
+  // Assign fixed stream numbers to wifi and channel random variables
+  streamsUsed += wifi.AssignStreams (devices, streamsUsed);
+  // Assign 6 streams per device
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch");
+  streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
+  // Assign 0 streams per channel for this configuration 
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch");
+
   // 2. Setup TCP/IP & AODV
   AodvHelper aodv; // Use default parameters here
   InternetStackHelper internetStack;
   internetStack.SetRoutingHelper (aodv);
   internetStack.Install (*m_nodes);
-  int64_t streamsUsed = aodv.AssignStreams (*m_nodes, 0);
-  NS_TEST_EXPECT_MSG_EQ (streamsUsed, m_size, "Should have assigned streams");
+  streamsUsed += aodv.AssignStreams (*m_nodes, 0);
+  // AODV uses m_size more streams
+  NS_TEST_EXPECT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + m_size), "Stream assignment mismatch");
 
   Ipv4AddressHelper address;
   address.SetBase ("10.1.1.0", "255.255.255.0");
diff --git a/src/aodv/test/bug-606-test-0-0.pcap b/src/aodv/test/bug-606-test-0-0.pcap
index 40699eb29..6fb776c27 100644
Binary files a/src/aodv/test/bug-606-test-0-0.pcap and b/src/aodv/test/bug-606-test-0-0.pcap differ
diff --git a/src/aodv/test/bug-606-test-1-0.pcap b/src/aodv/test/bug-606-test-1-0.pcap
index 7a8b2e995..a492d7f79 100644
Binary files a/src/aodv/test/bug-606-test-1-0.pcap and b/src/aodv/test/bug-606-test-1-0.pcap differ
diff --git a/src/aodv/test/bug-606-test-2-0.pcap b/src/aodv/test/bug-606-test-2-0.pcap
index 964f59009..4b6952407 100644
Binary files a/src/aodv/test/bug-606-test-2-0.pcap and b/src/aodv/test/bug-606-test-2-0.pcap differ
diff --git a/src/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc
index 43f04302a..966fed243 100644
--- a/src/aodv/test/bug-772.cc
+++ b/src/aodv/test/bug-772.cc
@@ -108,6 +108,7 @@ Bug772ChainTest::CreateNodes ()
 void
 Bug772ChainTest::CreateDevices ()
 {
+  int64_t streamsUsed = 0;
   // 1. Setup WiFi
   NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
   wifiMac.SetType ("ns3::AdhocWifiMac");
@@ -115,18 +116,28 @@ Bug772ChainTest::CreateDevices ()
   // This test suite output was originally based on YansErrorRateModel
   wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
-  wifiPhy.SetChannel (wifiChannel.Create ());
+  Ptr<YansWifiChannel> chan = wifiChannel.Create ();
+  wifiPhy.SetChannel (chan);
   WifiHelper wifi = WifiHelper::Default ();
   wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"));
   NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes); 
 
+  // Assign fixed stream numbers to wifi and channel random variables
+  streamsUsed += wifi.AssignStreams (devices, streamsUsed);
+  // Assign 6 streams per device
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch");
+  streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
+  // Assign 0 streams per channel for this configuration 
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch");
+
   // 2. Setup TCP/IP & AODV
   AodvHelper aodv; // Use default parameters here
   InternetStackHelper internetStack;
   internetStack.SetRoutingHelper (aodv);
   internetStack.Install (*m_nodes);
-  int64_t streamsUsed = aodv.AssignStreams (*m_nodes, 0);
-  NS_TEST_EXPECT_MSG_EQ (streamsUsed, m_size, "Should have assigned streams");
+  streamsUsed += aodv.AssignStreams (*m_nodes, streamsUsed);
+  // Expect to use m_size more streams for AODV
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + m_size), "Stream assignment mismatch");
   Ipv4AddressHelper address;
   address.SetBase ("10.1.1.0", "255.255.255.0");
   Ipv4InterfaceContainer interfaces = address.Assign (devices);
diff --git a/src/aodv/test/tcp-chain-test-0-0.pcap b/src/aodv/test/tcp-chain-test-0-0.pcap
index 13c1c4ad3..e72845a4e 100644
Binary files a/src/aodv/test/tcp-chain-test-0-0.pcap and b/src/aodv/test/tcp-chain-test-0-0.pcap differ
diff --git a/src/aodv/test/tcp-chain-test-9-0.pcap b/src/aodv/test/tcp-chain-test-9-0.pcap
index 00b1263a7..5d68ac7ba 100644
Binary files a/src/aodv/test/tcp-chain-test-9-0.pcap and b/src/aodv/test/tcp-chain-test-9-0.pcap differ
diff --git a/src/aodv/test/udp-chain-test-0-0.pcap b/src/aodv/test/udp-chain-test-0-0.pcap
index bd0090e7b..1275e5add 100644
Binary files a/src/aodv/test/udp-chain-test-0-0.pcap and b/src/aodv/test/udp-chain-test-0-0.pcap differ
diff --git a/src/aodv/test/udp-chain-test-9-0.pcap b/src/aodv/test/udp-chain-test-9-0.pcap
index bcc341187..39c6e8d66 100644
Binary files a/src/aodv/test/udp-chain-test-9-0.pcap and b/src/aodv/test/udp-chain-test-9-0.pcap differ