diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c
index 07749b6..8ce0cc0 100644
--- a/gst/rtp/gstrtpamrdepay.c
+++ b/gst/rtp/gstrtpamrdepay.c
@@ -64,11 +64,12 @@
         "encoding-params = (string) \"1\", "
         /* NOTE that all values must be strings in orde to be able to do SDP <->
          * GstCaps mapping. */
-        "octet-align = (string) \"1\", "
-        "crc = (string) { \"0\", \"1\" }, "
-        "robust-sorting = (string) \"0\", " "interleaving = (string) \"0\";"
+        "octet-align = (string) \"1\";"
         /* following options are not needed for a decoder
          *
+         "crc = (string) { \"0\", \"1\" }, "
+         "robust-sorting = (string) \"0\", "
+         "interleaving = (string) \"0\";"
          "mode-set = (int) [ 0, 7 ], "
          "mode-change-period = (int) [ 1, MAX ], "
          "mode-change-neighbor = (boolean) { TRUE, FALSE }, "
@@ -82,11 +83,12 @@
         "encoding-params = (string) \"1\", "
         /* NOTE that all values must be strings in orde to be able to do SDP <->
          * GstCaps mapping. */
-        "octet-align = (string) \"1\", "
-        "crc = (string) { \"0\", \"1\" }, "
-        "robust-sorting = (string) \"0\", " "interleaving = (string) \"0\""
+        "octet-align = (string) \"1\";"
         /* following options are not needed for a decoder
          *
+         "crc = (string) { \"0\", \"1\" }, "
+         "robust-sorting = (string) \"0\", "
+         "interleaving = (string) \"0\""
          "mode-set = (int) [ 0, 7 ], "
          "mode-change-period = (int) [ 1, MAX ], "
          "mode-change-neighbor = (boolean) { TRUE, FALSE }, "
diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c
index 5cddce7..63db391 100644
--- a/tests/check/elements/rtp-payloading.c
+++ b/tests/check/elements/rtp-payloading.c
@@ -699,7 +699,7 @@
 {
   rtp_pipeline_test (rtp_mp4v_list_frame_data, rtp_mp4v_list_frame_data_size,
       rtp_mp4v_list_frame_count,
-      "video/mpeg,mpegversion=4,codec_data=(buffer)000001b001",
+      "video/mpeg,mpegversion=4,systemstream=false,codec_data=(buffer)000001b001",
       "rtpmp4vpay", "rtpmp4vdepay", rtp_mp4v_list_bytes_sent, 0, TRUE);
 }
 
@@ -717,8 +717,8 @@
 {
   rtp_pipeline_test (rtp_mp4g_frame_data, rtp_mp4g_frame_data_size,
       rtp_mp4g_frame_count,
-      "video/mpeg,mpegversion=4,codec_data=(buffer)000001b001", "rtpmp4gpay",
-      "rtpmp4gdepay", 0, 0, FALSE);
+      "video/mpeg,mpegversion=4,systemstream=false,codec_data=(buffer)000001b001",
+      "rtpmp4gpay", "rtpmp4gdepay", 0, 0, FALSE);
 }
 
 GST_END_TEST;