diff --git a/src/modules/video_coding/main/test/generic_codec_test.cc b/src/modules/video_coding/main/test/generic_codec_test.cc
index 78eefe858..f3c47c0fe 100644
--- a/src/modules/video_coding/main/test/generic_codec_test.cc
+++ b/src/modules/video_coding/main/test/generic_codec_test.cc
@@ -580,8 +580,5 @@ VCMEncComplete_KeyReqTest::SendData(
     _timeStamp += 3000;
     rtpInfo.type.Video.isFirstPacket = false;
     rtpInfo.frameType = kVideoFrameKey;
-    // TODO(hlundin): Remove assert once we've piped PictureID into VCM
-    // through the WebRtcRTPHeader.
-    assert(rtpInfo.type.Video.codec != kRTPVideoVP8);
     return _vcm.IncomingPacket(payloadData, payloadSize, rtpInfo);
 }
diff --git a/src/modules/video_coding/main/test/normal_test.cc b/src/modules/video_coding/main/test/normal_test.cc
index 3453602b5..e4f4fcf94 100644
--- a/src/modules/video_coding/main/test/normal_test.cc
+++ b/src/modules/video_coding/main/test/normal_test.cc
@@ -99,6 +99,10 @@ VCMNTEncodeCompleteCallback::SendData(
         break;
     case kVideoCodecVP8:
         rtpInfo.type.Video.codec = kRTPVideoVP8;
+        rtpInfo.type.Video.codecHeader.VP8.nonReference =
+            videoTypeHdr->VP8.nonReference;
+        rtpInfo.type.Video.codecHeader.VP8.pictureId =
+            videoTypeHdr->VP8.pictureId;
         break;
     case kVideoCodecI420:
         rtpInfo.type.Video.codec = kRTPVideoI420;
@@ -121,9 +125,6 @@ VCMNTEncodeCompleteCallback::SendData(
     {
         _skipCnt++;
     }
-    // TODO(hlundin): Remove assert once we've piped PictureID into VCM
-    // through the WebRtcRTPHeader.
-    assert(rtpInfo.type.Video.codec != kRTPVideoVP8);
     _VCMReceiver->IncomingPacket(payloadData, payloadSize, rtpInfo);
     return 0;
 }
diff --git a/src/modules/video_coding/main/test/test_util.cc b/src/modules/video_coding/main/test/test_util.cc
index d102699db..8e1c192d2 100644
--- a/src/modules/video_coding/main/test/test_util.cc
+++ b/src/modules/video_coding/main/test/test_util.cc
@@ -83,6 +83,12 @@ VCMEncodeCompleteCallback::SendData(
         rtpInfo.type.Video.width = (WebRtc_UWord16)_width;
         break;
     case webrtc::kRTPVideoVP8:
+        rtpInfo.type.Video.codecHeader.VP8.nonReference =
+            videoTypeHdr->VP8.nonReference;
+        rtpInfo.type.Video.codecHeader.VP8.pictureId =
+            videoTypeHdr->VP8.pictureId;
+        break;
+    case webrtc::kRTPVideoI420:
         break;
     default:
         assert(false);
@@ -99,9 +105,6 @@ VCMEncodeCompleteCallback::SendData(
 
     _encodedBytes += payloadSize;
     // directly to receiver
-    // TODO(hlundin): Remove assert once we've piped PictureID into VCM
-    // through the WebRtcRTPHeader.
-    assert(rtpInfo.type.Video.codec != kRTPVideoVP8);
     int ret = _VCMReceiver->IncomingPacket(payloadData, payloadSize, rtpInfo);
     _encodeComplete = true;