diff --git a/src/qgcunittest/MockMavlinkFileServer.cc b/src/qgcunittest/MockMavlinkFileServer.cc
index 7c768f18ddc6a31e094b322e8590a1a1031d8eb8..b52674a25dc8f446d3f27b46fa4b4b08d0c1c521 100644
--- a/src/qgcunittest/MockMavlinkFileServer.cc
+++ b/src/qgcunittest/MockMavlinkFileServer.cc
@@ -28,7 +28,6 @@ const MockMavlinkFileServer::ErrorMode_t MockMavlinkFileServer::rgFailureModes[]
     MockMavlinkFileServer::errModeNakResponse,
     MockMavlinkFileServer::errModeNoSecondResponse,
     MockMavlinkFileServer::errModeNakSecondResponse,
-    MockMavlinkFileServer::errModeBadCRC,
     MockMavlinkFileServer::errModeBadSequence,
 };
 const size_t MockMavlinkFileServer::cFailureModes = sizeof(MockMavlinkFileServer::rgFailureModes) / sizeof(MockMavlinkFileServer::rgFailureModes[0]);
@@ -233,12 +232,6 @@ void MockMavlinkFileServer::sendMessage(mavlink_message_t message)
         return;
     }
 
-    // Validate CRC
-    if (request->hdr.crc32 != QGCUASFileManager::crc32(request)) {
-        qDebug() << "Bad CRC received - opcode:" << request->hdr.opcode << "expected:" << request->hdr.crc32 << "actual:" << QGCUASFileManager::crc32(request);
-        _sendNak(QGCUASFileManager::kErrCrc, outgoingSeqNumber);
-    }
-
     switch (request->hdr.opcode) {
         case QGCUASFileManager::kCmdTestNoAck:
             // ignored, ack not sent back, for testing only
@@ -252,7 +245,6 @@ void MockMavlinkFileServer::sendMessage(mavlink_message_t message)
             // ignored, always acked
             ackResponse.hdr.opcode = QGCUASFileManager::kRspAck;
             ackResponse.hdr.session = 0;
-            ackResponse.hdr.crc32 = 0;
             ackResponse.hdr.size = 0;
             _emitResponse(&ackResponse, outgoingSeqNumber);
             break;
@@ -312,12 +304,6 @@ void MockMavlinkFileServer::_emitResponse(QGCUASFileManager::Request* request, u
     
     request->hdr.seqNumber = seqNumber;
     
-    request->hdr.crc32 = QGCUASFileManager::crc32(request);
-    if (_errMode == errModeBadCRC) {
-        // Return a bad CRC
-        request->hdr.crc32++;
-    }
-    
     mavlink_msg_file_transfer_protocol_pack(_systemIdServer,    // System ID
                                             0,                  // Component ID
                                             &mavlinkMessage,    // Mavlink Message to pack into
diff --git a/src/qgcunittest/MockMavlinkFileServer.h b/src/qgcunittest/MockMavlinkFileServer.h
index 0ac2552f6d56d513a2281771eae6d324101e0307..7e4e303b1ba5c63135786846f2ae4691e76a4fa0 100644
--- a/src/qgcunittest/MockMavlinkFileServer.h
+++ b/src/qgcunittest/MockMavlinkFileServer.h
@@ -56,7 +56,6 @@ public:
         errModeNakResponse,         ///< Nak all requests
         errModeNoSecondResponse,    ///< No response to subsequent request to initial command
         errModeNakSecondResponse,   ///< Nak subsequent request to initial command
-        errModeBadCRC,              ///< Return response with bad CRC
         errModeBadSequence          ///< Return response with bad sequence number
     } ErrorMode_t;