diff --git a/src/internet/wscript b/src/internet/wscript
index 82a774fc6..d566572c9 100644
--- a/src/internet/wscript
+++ b/src/internet/wscript
@@ -240,7 +240,6 @@ def build(bld):
         'test/ipv6-packet-info-tag-test-suite.cc',
         'test/ipv6-test.cc',
         'test/ipv6-raw-test.cc',
-        'test/pfifo-fast-queue-disc-test-suite.cc',
         'test/tcp-test.cc',
         'test/tcp-timestamp-test.cc',
         'test/tcp-wscaling-test.cc',
diff --git a/src/test/adaptive-red-queue-disc-test-suite.cc b/src/test/ns3tc/adaptive-red-queue-disc-test-suite.cc
similarity index 100%
rename from src/test/adaptive-red-queue-disc-test-suite.cc
rename to src/test/ns3tc/adaptive-red-queue-disc-test-suite.cc
diff --git a/src/internet/test/pfifo-fast-queue-disc-test-suite.cc b/src/test/ns3tc/pfifo-fast-queue-disc-test-suite.cc
similarity index 100%
rename from src/internet/test/pfifo-fast-queue-disc-test-suite.cc
rename to src/test/ns3tc/pfifo-fast-queue-disc-test-suite.cc
diff --git a/src/test/wscript b/src/test/wscript
index 41d328a31..ced076d61 100644
--- a/src/test/wscript
+++ b/src/test/wscript
@@ -29,8 +29,9 @@ def build(bld):
 
     test_test = bld.create_ns3_module_test_library('test')
     test_test.source = [
-        'adaptive-red-queue-disc-test-suite.cc',
         'csma-system-test-suite.cc',
+        'ns3tc/adaptive-red-queue-disc-test-suite.cc',
+        'ns3tc/pfifo-fast-queue-disc-test-suite.cc',
         'ns3tcp/ns3tcp-cwnd-test-suite.cc',
         'ns3tcp/ns3tcp-interop-test-suite.cc',
         'ns3tcp/ns3tcp-loss-test-suite.cc',
diff --git a/src/traffic-control/doc/pfifo-fast.rst b/src/traffic-control/doc/pfifo-fast.rst
index bbffdf87f..eabb4ba52 100644
--- a/src/traffic-control/doc/pfifo-fast.rst
+++ b/src/traffic-control/doc/pfifo-fast.rst
@@ -7,8 +7,9 @@ pfifo_fast queue disc
 Model Description
 *****************
 
-Linux pfifo_fast is the default priority queue enabled on Linux
-systems. Packets are enqueued in three priority bands (implemented
+PfifoFastQueueDisc behaves like pfifo_fast, which is the default queue disc
+enabled on Linux systems (init systems such as systemd may override such default
+setting). Packets are enqueued in three priority bands (implemented
 as FIFO droptail queues) based on their priority (users can read
 :ref:`Socket-options` for details on how to set packet priority).
 The four least significant bits of the priority are used to determine
@@ -58,14 +59,14 @@ The PfifoFastQueueDisc class holds a single attribute:
 Examples
 ========
 
-The traffic-control example located in ``examples/traffic-control`` shows how to configure
-and install a pfifo_fast queue on Ipv4 nodes.
+Various examples located in ``src/traffic-control/examples`` (e.g., codel-vs-pfifo-asymmetric.cc)
+shows how to configure and install a PfifoFastQueueDisc on internet nodes.
 
 Validation
 **********
 
 The pfifo_fast model is tested using :cpp:class:`PfifoFastQueueDiscTestSuite` class defined
-in ``src/traffic-control/test/pfifo-fast-queue-disc-test-suite.cc``. The suite includes 4 test cases:
+in ``src/test/ns3tc/pfifo-fast-queue-disc-test-suite.cc``. The suite includes 4 test cases:
 
 * Test 1: The first test checks whether IPv4 packets are enqueued in the correct band based on the TOS byte
 * Test 2: The second test checks whether IPv4 packets are enqueued in the correct band based on the TOS byte