diff --git a/tests/main.cpp b/tests/main.cpp
index d43aa5a..10f957c 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -6,4 +6,13 @@
 #define BOOST_TEST_MAIN 1
 #define BOOST_TEST_DYN_LINK 1
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
+#endif // __clang__
+
 #include <boost/test/unit_test.hpp>
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif // __clang__
diff --git a/tests/security/identity-fixture.cpp b/tests/security/identity-fixture.cpp
index 1c286e2..899f5de 100644
--- a/tests/security/identity-fixture.cpp
+++ b/tests/security/identity-fixture.cpp
@@ -5,8 +5,18 @@
  */
 
 #include "security/key-chain.hpp"
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
+#endif // __clang__
+
 #include <boost/test/unit_test.hpp>
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif // __clang__
+
 namespace ndn {
 
 // OSX KeyChain, when used on a headless server,
diff --git a/tests/security/test-encode-decode-certificate.cpp b/tests/security/test-encode-decode-certificate.cpp
index 3b8cc83..733a9ae 100644
--- a/tests/security/test-encode-decode-certificate.cpp
+++ b/tests/security/test-encode-decode-certificate.cpp
@@ -8,14 +8,7 @@
 #include "security/certificate.hpp"
 #include "security/public-key.hpp"
 
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wtautological-compare"
-#endif
-
-#include <cryptopp/cryptlib.h>
-#include <cryptopp/rsa.h>
-#include <cryptopp/files.h>
+#include "security/cryptopp.hpp"
 
 #include <fstream>
 #include <boost/test/output_test_stream.hpp>
diff --git a/tests/security/test-sec-tpm-file.cpp b/tests/security/test-sec-tpm-file.cpp
index 70fada8..056fedf 100644
--- a/tests/security/test-sec-tpm-file.cpp
+++ b/tests/security/test-sec-tpm-file.cpp
@@ -4,16 +4,11 @@
  * See COPYING for copyright and distribution information.
  */
 
-#if __clang__
-#pragma clang diagnostic ignored "-Wtautological-compare"
-#endif
-
 #include <boost/test/unit_test.hpp>
 
 #include "security/key-chain.hpp"
 #include "util/time.hpp"
-#include <cryptopp/rsa.h>
-#include <cryptopp/hex.h>
+#include "security/cryptopp.hpp"
 
 using namespace std;
 namespace ndn {
diff --git a/tests/security/test-sec-tpm-osx.cpp b/tests/security/test-sec-tpm-osx.cpp
index a08dc48..941b06d 100644
--- a/tests/security/test-sec-tpm-osx.cpp
+++ b/tests/security/test-sec-tpm-osx.cpp
@@ -4,17 +4,11 @@
  * See COPYING for copyright and distribution information.
  */
 
-#if __clang__
-#pragma clang diagnostic ignored "-Wtautological-compare"
-#endif
-
 #include <boost/test/unit_test.hpp>
 
 #include "security/key-chain.hpp"
 #include "util/time.hpp"
-#include <cryptopp/rsa.h>
-#include <cryptopp/files.h>
-#include <cryptopp/hex.h>
+#include "security/cryptopp.hpp"
 
 using namespace std;
 namespace ndn {
diff --git a/tests/security/test-signature-sha256.cpp b/tests/security/test-signature-sha256.cpp
index bb1b756..daf359b 100644
--- a/tests/security/test-signature-sha256.cpp
+++ b/tests/security/test-signature-sha256.cpp
@@ -9,9 +9,7 @@
 #include "security/key-chain.hpp"
 #include "security/validator.hpp"
 
-#include <cryptopp/base64.h>
-#include <cryptopp/hex.h>
-#include <cryptopp/files.h>
+#include "security/cryptopp.hpp"
 
 using namespace std;
 namespace ndn {
diff --git a/tests/test-data.cpp b/tests/test-data.cpp
index 19241b5..0034ffa 100644
--- a/tests/test-data.cpp
+++ b/tests/test-data.cpp
@@ -10,9 +10,7 @@
 
 #include <fstream>
 
-#include <cryptopp/rsa.h>
-#include <cryptopp/osrng.h>
-#include <cryptopp/files.h>
+#include "security/cryptopp.hpp"
 
 using namespace std;
 namespace ndn {
@@ -170,7 +168,6 @@
   
   RSASS<PKCS1v15, SHA256>::Signer signer(privateKey_);
 
-  int i = 0;
   PK_MessageAccumulator *hash = signer.NewSignatureAccumulator(rng_);
   hash->Update(d.getName().    wireEncode().wire(), d.getName().    wireEncode().size());
   hash->Update(d.getMetaInfo().wireEncode().wire(), d.getMetaInfo().wireEncode().size());