diff --git a/crypto/evp/CMakeLists.txt b/crypto/evp/CMakeLists.txt
index dc1734c..070a7f6 100644
--- a/crypto/evp/CMakeLists.txt
+++ b/crypto/evp/CMakeLists.txt
@@ -28,4 +28,11 @@
 	evp_test.c
 )
 
+add_executable(
+	pbkdf_test
+
+	pbkdf_test.c
+)
+
 target_link_libraries(evp_test crypto)
+target_link_libraries(pbkdf_test crypto)
diff --git a/crypto/evp/pbkdf_test.c b/crypto/evp/pbkdf_test.c
new file mode 100644
index 0000000..88b3dbe
--- /dev/null
+++ b/crypto/evp/pbkdf_test.c
@@ -0,0 +1,178 @@
+/* Copyright (c) 2015, Google Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+
+#include <stdio.h>
+
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/digest.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+
+
+/* Prints out the data buffer as a sequence of hex bytes */
+static void print_data_hex(const void *data, size_t len) {
+  size_t i;
+  for (i = 0; i < len; ++i) {
+    fprintf(stderr, "%02x", (int)((const uint8_t *)data)[i]);
+  }
+}
+
+/* Helper for testing that PBKDF2 derives the expected key from the given
+ * inputs. Returns 1 on success, 0 otherwise. */
+static int test_PBKDF2(const void *password, size_t password_len,
+                       const void *salt, size_t salt_len, unsigned iterations,
+                       const EVP_MD *digest, size_t key_len,
+                       const uint8_t *expected_key) {
+  uint8_t key[64];
+
+  if (key_len > sizeof(key)) {
+    fprintf(stderr, "Output buffer is not large enough.\n");
+    return 0;
+  }
+
+  if (!PKCS5_PBKDF2_HMAC(password, password_len, salt, salt_len, iterations,
+                         digest, key_len, key)) {
+    fprintf(stderr, "Call to PKCS5_PBKDF2_HMAC failed\n");
+    BIO_print_errors_fp(stderr);
+    return 0;
+  }
+
+  if (memcmp(key, expected_key, key_len) != 0) {
+    fprintf(stderr, "Resulting key material does not match expectation\n");
+    fprintf(stderr, "Expected:\n    ");
+    print_data_hex(expected_key, key_len);
+    fprintf(stderr, "\nActual:\n    ");
+    print_data_hex(key, key_len);
+    fprintf(stderr, "\n");
+    return 0;
+  }
+
+  return 1;
+}
+
+/* Tests deriving a key using an empty password (specified both as NULL and as
+ * non-NULL). Note that NULL has special meaning to HMAC initialization. */
+static int test_empty_password(void) {
+  const uint8_t kKey[] = {0xa3, 0x3d, 0xdd, 0xc3, 0x04, 0x78, 0x18,
+                          0x55, 0x15, 0x31, 0x1f, 0x87, 0x52, 0x89,
+                          0x5d, 0x36, 0xea, 0x43, 0x63, 0xa2};
+
+  if (!test_PBKDF2(NULL, 0, "salt", 4, 1, EVP_sha1(), sizeof(kKey), kKey) ||
+      !test_PBKDF2("", 0, "salt", 4, 1, EVP_sha1(), sizeof(kKey), kKey)) {
+    return 0;
+  }
+
+  return 1;
+}
+
+/* Tests deriving a key using an empty salt. Note that the expectation was
+ * generated using OpenSSL itself, and hence is not verified. */
+static int test_empty_salt(void) {
+  const uint8_t kKey[] = {0x8b, 0xc2, 0xf9, 0x16, 0x7a, 0x81, 0xcd, 0xcf,
+                          0xad, 0x12, 0x35, 0xcd, 0x90, 0x47, 0xf1, 0x13,
+                          0x62, 0x71, 0xc1, 0xf9, 0x78, 0xfc, 0xfc, 0xb3,
+                          0x5e, 0x22, 0xdb, 0xea, 0xfa, 0x46, 0x34, 0xf6};
+
+  if (!test_PBKDF2("password", 8, NULL, 0, 2, EVP_sha256(), sizeof(kKey),
+                   kKey) ||
+      !test_PBKDF2("password", 8, "", 0, 2, EVP_sha256(), sizeof(kKey), kKey)) {
+    return 0;
+  }
+
+  return 1;
+}
+
+/* Exercises test vectors taken from https://tools.ietf.org/html/rfc6070.
+ * Note that each of these test vectors uses SHA-1 as the digest. */
+static int test_rfc6070_vectors(void) {
+  const uint8_t kKey1[] = {0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e,
+                           0x71, 0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60,
+                           0x12, 0x06, 0x2f, 0xe0, 0x37, 0xa6};
+  const uint8_t kKey2[] = {0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f,
+                           0x8c, 0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d,
+                           0x41, 0xf0, 0xd8, 0xde, 0x89, 0x57};
+  const uint8_t kKey3[] = {0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d,
+                           0xcc, 0x37, 0xd7, 0xf0, 0x34, 0x25, 0xe0, 0xc3};
+
+  if (!test_PBKDF2("password", 8, "salt", 4, 1, EVP_sha1(), sizeof(kKey1),
+                   kKey1) ||
+      !test_PBKDF2("password", 8, "salt", 4, 2, EVP_sha1(), sizeof(kKey2),
+                   kKey2) ||
+      !test_PBKDF2("pass\0word", 9, "sa\0lt", 5, 4096, EVP_sha1(),
+                   sizeof(kKey3), kKey3)) {
+    return 0;
+  }
+
+  return 1;
+}
+
+/* Tests key derivation using SHA-2 digests */
+static int test_sha2(void) {
+  /* This test was taken from:
+   * http://stackoverflow.com/questions/5130513/pbkdf2-hmac-sha2-test-vectors */
+  const uint8_t kKey1[] = {0xae, 0x4d, 0x0c, 0x95, 0xaf, 0x6b, 0x46, 0xd3,
+                           0x2d, 0x0a, 0xdf, 0xf9, 0x28, 0xf0, 0x6d, 0xd0,
+                           0x2a, 0x30, 0x3f, 0x8e, 0xf3, 0xc2, 0x51, 0xdf,
+                           0xd6, 0xe2, 0xd8, 0x5a, 0x95, 0x47, 0x4c, 0x43};
+
+  /* This test was taken from:
+   * http://stackoverflow.com/questions/15593184/pbkdf2-hmac-sha-512-test-vectors */
+  const uint8_t kKey2[] = {
+      0x8c, 0x05, 0x11, 0xf4, 0xc6, 0xe5, 0x97, 0xc6, 0xac, 0x63, 0x15,
+      0xd8, 0xf0, 0x36, 0x2e, 0x22, 0x5f, 0x3c, 0x50, 0x14, 0x95, 0xba,
+      0x23, 0xb8, 0x68, 0xc0, 0x05, 0x17, 0x4d, 0xc4, 0xee, 0x71, 0x11,
+      0x5b, 0x59, 0xf9, 0xe6, 0x0c, 0xd9, 0x53, 0x2f, 0xa3, 0x3e, 0x0f,
+      0x75, 0xae, 0xfe, 0x30, 0x22, 0x5c, 0x58, 0x3a, 0x18, 0x6c, 0xd8,
+      0x2b, 0xd4, 0xda, 0xea, 0x97, 0x24, 0xa3, 0xd3, 0xb8};
+
+  if (!test_PBKDF2("password", 8, "salt", 4, 2, EVP_sha256(), sizeof(kKey1),
+                   kKey1) ||
+      !test_PBKDF2("passwordPASSWORDpassword", 24,
+                   "saltSALTsaltSALTsaltSALTsaltSALTsalt", 36, 4096,
+                   EVP_sha512(), sizeof(kKey2), kKey2)) {
+    return 0;
+  }
+
+  return 1;
+}
+
+int main(void) {
+  CRYPTO_library_init();
+  ERR_load_crypto_strings();
+
+  if (!test_empty_password()) {
+    fprintf(stderr, "test_empty_password failed\n");
+    return 1;
+  }
+
+  if (!test_empty_salt()) {
+    fprintf(stderr, "test_empty_salt failed\n");
+    return 1;
+  }
+
+  if (!test_rfc6070_vectors()) {
+    fprintf(stderr, "test_rfc6070_vectors failed\n");
+    return 1;
+  }
+
+  if (!test_sha2()) {
+    fprintf(stderr, "test_sha2 failed\n");
+    return 1;
+  }
+
+  printf("PASS\n");
+  ERR_free_strings();
+  return 0;
+}
diff --git a/util/all_tests.sh b/util/all_tests.sh
index fa5f33c..bcb5c24 100644
--- a/util/all_tests.sh
+++ b/util/all_tests.sh
@@ -55,6 +55,7 @@
 ./crypto/ecdsa/ecdsa_test
 ./crypto/err/err_test
 ./crypto/evp/evp_test
+./crypto/evp/pbkdf_test
 ./crypto/hkdf/hkdf_test
 ./crypto/hmac/hmac_test
 ./crypto/lhash/lhash_test