diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index f2767e0197..d968dd242c 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -284,6 +284,7 @@ if (use_libfuzzer) {
   group("webrtc_fuzzers") {
     testonly = true
     deps = [
+      "test/fuzzers:vp8_qp_parser_fuzzer",
       "test/fuzzers:vp9_depacketizer_fuzzer",
     ]
   }
diff --git a/webrtc/test/fuzzers/BUILD.gn b/webrtc/test/fuzzers/BUILD.gn
index 96e09ecdbc..4cf6a5ce91 100644
--- a/webrtc/test/fuzzers/BUILD.gn
+++ b/webrtc/test/fuzzers/BUILD.gn
@@ -15,6 +15,7 @@ static_library("webrtc_fuzzer_main") {
   ]
   deps = [
     "../../system_wrappers:field_trial_default",
+    "../../system_wrappers:metrics_default",
     "//testing/libfuzzer:libfuzzer_main",
   ]
 }
@@ -33,3 +34,19 @@ test("vp9_depacketizer_fuzzer") {
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 }
+
+test("vp8_qp_parser_fuzzer") {
+  sources = [
+    "vp8_qp_parser_fuzzer.cc",
+  ]
+  deps = [
+    ":webrtc_fuzzer_main",
+    "../../modules/video_coding/",
+  ]
+
+  if (is_clang) {
+    # Suppress warnings from Chrome's Clang plugins.
+    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+    configs -= [ "//build/config/clang:find_bad_constructs" ]
+  }
+}
diff --git a/webrtc/test/fuzzers/vp8_qp_parser_fuzzer.cc b/webrtc/test/fuzzers/vp8_qp_parser_fuzzer.cc
new file mode 100644
index 0000000000..5135f1a471
--- /dev/null
+++ b/webrtc/test/fuzzers/vp8_qp_parser_fuzzer.cc
@@ -0,0 +1,17 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
+
+namespace webrtc {
+void FuzzOneInput(const uint8_t* data, size_t size) {
+  int qp;
+  vp8::GetQp(data, size, &qp);
+}
+}  // namespace webrtc