diff --git a/test/test-profile.cc b/test/test-profile.cc
index 56b7d4b..9c1b67a 100644
--- a/test/test-profile.cc
+++ b/test/test-profile.cc
@@ -7,9 +7,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "profile-data.h"
-#include <ndn-cpp-dev/security/key-chain.hpp>
-#include <ndn-cpp-dev/util/time.hpp>
+#include "profile.h"
 
 using namespace ndn;
 using namespace std;
@@ -40,34 +38,4 @@
   BOOST_CHECK_EQUAL(decodedProfile["school"], string("UCLA"));
 }
 
-BOOST_AUTO_TEST_CASE(EncodeDecodeProfileData)
-{
-  Name identity("/ndn/ucla/yingdi");
-  Profile profile(identity);
-  profile["name"] = "Yingdi Yu";
-  profile["school"] = "UCLA";
-
-  ProfileData profileData(profile);
-  
-  KeyChainImpl<SecPublicInfoSqlite3, SecTpmFile> keyChain;
-  Name signingIdentity("/EncodeDecodeProfile/EncodeDecodeProfileData");
-  keyChain.createIdentity(signingIdentity);
-  keyChain.signByIdentity(profileData, signingIdentity);
-
-  Block encodedBlock = profileData.wireEncode();
-
-  Data decodedData;
-  decodedData.wireDecode(encodedBlock);
-  
-  ProfileData decodedProfileData(decodedData);
-  Profile decodedProfile = decodedProfileData.getProfile();
-
-  BOOST_CHECK_EQUAL(profileData.getIdentityName(), string("/ndn/ucla/yingdi"));
-  BOOST_CHECK_EQUAL(decodedProfile["name"], string("Yingdi Yu"));
-  BOOST_CHECK_EQUAL(decodedProfile["school"], string("UCLA"));
-  
-  keyChain.deleteIdentity(signingIdentity);
-}
-
-
 BOOST_AUTO_TEST_SUITE_END()