diff --git a/tests/networking/src/PacketTests.cpp b/tests/networking/src/PacketTests.cpp
index c8c88679fb..8ac4a6d94e 100644
--- a/tests/networking/src/PacketTests.cpp
+++ b/tests/networking/src/PacketTests.cpp
@@ -10,5 +10,173 @@
 //
 
 #include "PacketTests.h"
+#include "../QTestExtensions.h"
+
+#include <udt/Packet.h>
 
 QTEST_MAIN(PacketTests)
+
+std::unique_ptr<Packet> copyToReadPacket(std::unique_ptr<Packet>& packet) {
+    auto size = packet->getDataSize();
+    auto data = std::unique_ptr<char>(new char[size]);
+    memcpy(data.get(), packet->getData(), size);
+    return Packet::fromReceivedPacket(std::move(data), size, HifiSockAddr());
+}
+
+void PacketTests::emptyPacketTest() {
+    auto packet = Packet::create(PacketType::Unknown);
+
+    QCOMPARE(packet->getType(), PacketType::Unknown);
+    QCOMPARE(packet->getPayloadSize(), 0);
+    QCOMPARE(packet->getDataSize(), packet->totalHeadersSize());
+    QCOMPARE(packet->bytesLeftToRead(), 0);
+    QCOMPARE(packet->bytesAvailableForWrite(), packet->getPayloadCapacity());
+}
+
+void PacketTests::packetTypeTest() {
+    auto packet = Packet::create(PacketType::EntityAdd);
+
+    QCOMPARE(packet->getType(), PacketType::EntityAdd);
+
+    packet->setType(PacketType::MixedAudio);
+    QCOMPARE(packet->getType(), PacketType::MixedAudio);
+
+    packet->setType(PacketType::MuteEnvironment);
+    QCOMPARE(packet->getType(), PacketType::MuteEnvironment);
+}
+
+void PacketTests::writeTest() {
+    auto packet = Packet::create(PacketType::Unknown);
+
+    QCOMPARE(packet->getPayloadSize(), 0);
+
+    QCOMPARE(packet->write("somedata"), 8);
+    QCOMPARE(packet->getPayloadSize(), 8);
+
+    QCOMPARE(packet->write("moredata"), 8);
+    QCOMPARE(packet->getPayloadSize(), 16);
+
+    COMPARE_DATA(packet->getPayload(), "somedatamoredata", 16);
+}
+
+void PacketTests::readTest() {
+    // Test reads for several different size packets
+    for (int i = 1; i < 4; i++) {
+        auto packet = Packet::create(PacketType::Unknown);
+
+        auto size = packet->getPayloadCapacity();
+        size /= i;
+
+        char* data = new char[size];
+
+        // Fill with "random" data
+        for (qint64 i = 0; i < size; i++) {
+            data[i] = i;
+        }
+
+        QCOMPARE(packet->write(data, size), size);
+
+        auto readPacket = copyToReadPacket(packet);
+
+        QCOMPARE(readPacket->getDataSize(), packet->getDataSize());
+        QCOMPARE(readPacket->getPayloadSize(), packet->getPayloadSize());
+        COMPARE_DATA(readPacket->getData(), packet->getData(), packet->getDataSize());
+        COMPARE_DATA(readPacket->getPayload(), packet->getPayload(), packet->getPayloadSize());
+
+        auto payloadSize = readPacket->getPayloadSize();
+        char* readData = new char[payloadSize];
+        QCOMPARE(readPacket->read(readData, payloadSize), payloadSize);
+        COMPARE_DATA(readData, data, payloadSize);
+    }
+}
+
+void PacketTests::writePastCapacityTest() {
+    auto packet = Packet::create(PacketType::Unknown);
+
+    auto size = packet->getPayloadCapacity();
+    char* data = new char[size];
+
+    // Fill with "random" data
+    for (qint64 i = 0; i < size; i++) {
+        data[i] = i;
+    }
+
+    QCOMPARE(packet->getPayloadSize(), 0);
+
+    QCOMPARE(packet->write(data, size), size);
+
+    QCOMPARE(packet->getPayloadSize(), size);
+    COMPARE_DATA(packet->getPayload(), data, size);
+
+    QCOMPARE(packet->bytesAvailableForWrite(), 0);
+    QCOMPARE(packet->getPayloadSize(), size);
+
+    QCOMPARE(Packet::PACKET_WRITE_ERROR, packet->write("data"));
+ 
+    // Packet::write() shouldn't allow the caller to write if no space is left
+    QCOMPARE(packet->getPayloadSize(), size);
+}
+
+void PacketTests::primitiveTest() {
+    auto packet = Packet::create(PacketType::Unknown);
+
+    int value1 = 5;
+    char value2 = 10;
+    bool value3 = true;
+    qint64 value4 = -93404;
+     
+    packet->writePrimitive(value1);
+    packet->writePrimitive(value2);
+    packet->writePrimitive(value3);
+    packet->writePrimitive(value4);
+
+    auto recvPacket = copyToReadPacket(packet);
+
+    // Peek & read first value
+    { 
+        int peekValue = 0;
+        QCOMPARE(recvPacket->peekPrimitive(&peekValue), (int)sizeof(peekValue));
+        QCOMPARE(peekValue, value1);
+        int readValue = 0;
+        QCOMPARE(recvPacket->readPrimitive(&readValue), (int)sizeof(readValue));
+        QCOMPARE(readValue, value1);
+    }
+
+    // Peek & read second value
+    {
+        char peekValue = 0;
+        QCOMPARE(recvPacket->peekPrimitive(&peekValue), (int)sizeof(peekValue));
+        QCOMPARE(peekValue, value2);
+
+        char readValue = 0;
+        QCOMPARE(recvPacket->readPrimitive(&readValue), (int)sizeof(readValue));
+        QCOMPARE(readValue, value2);
+    }
+
+    // Peek & read third value
+    {
+        bool peekValue = 0;
+        QCOMPARE(recvPacket->peekPrimitive(&peekValue), (int)sizeof(peekValue));
+        QCOMPARE(peekValue, value3);
+
+        bool readValue = 0;
+        QCOMPARE(recvPacket->readPrimitive(&readValue), (int)sizeof(readValue));
+        QCOMPARE(readValue, value3);
+    }
+
+    // Peek & read fourth value
+    {
+        qint64 peekValue = 0;
+        QCOMPARE(recvPacket->peekPrimitive(&peekValue), (int)sizeof(peekValue));
+        QCOMPARE(peekValue, value4);
+
+        qint64 readValue = 0;
+        QCOMPARE(recvPacket->readPrimitive(&readValue), (int)sizeof(readValue));
+        QCOMPARE(readValue, value4);
+    }
+
+    // We should be at the end of the packet, with no more to peek or read
+    int noValue;
+    QCOMPARE(recvPacket->peekPrimitive(&noValue), 0);
+    QCOMPARE(recvPacket->readPrimitive(&noValue), 0);
+}
diff --git a/tests/networking/src/PacketTests.h b/tests/networking/src/PacketTests.h
index 498fddf39a..44ae193523 100644
--- a/tests/networking/src/PacketTests.h
+++ b/tests/networking/src/PacketTests.h
@@ -19,7 +19,23 @@
 class PacketTests : public QObject {
     Q_OBJECT
 private slots:
+    // Test the base state of Packet
+    void emptyPacketTest();
+
+    // Test Packet writes
+    void writeTest();
+
+    // Test Packet reads
     void readTest();
+
+    // Test Packet writing past capacity
+    void writePastCapacityTest();
+
+    // Test primitive reads and writes
+    void primitiveTest();
+
+    // Test set/get packet type
+    void packetTypeTest();
 };
 
 #endif // hifi_PacketTests_h