diff --git a/Makefile.am b/Makefile.am
index ca679d6..37557dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,22 @@
 
 lib_LIBRARIES = ndn-cpp.a
 
-bin_PROGRAMS = test1
+bin_PROGRAMS = test-encode-decode-interest
 
-ndn_cpp_a_SOURCES = ndn-cpp/fields/name.h ndn-cpp/fields/name.cc
+ndn_cpp_a_SOURCES = ndn-cpp/common.h ndn-cpp/config.h \
+  ndn-cpp/data.h ndn-cpp/data.cc \
+  ndn-cpp/interest.h ndn-cpp/interest.cc \
+  ndn-cpp/fields/blob.h \
+  ndn-cpp/fields/content.h ndn-cpp/fields/content.cc \
+  ndn-cpp/fields/exclude.h ndn-cpp/fields/exclude.cc \
+  ndn-cpp/fields/key-locator.h ndn-cpp/fields/key-locator.cc \
+  ndn-cpp/fields/name-component.h ndn-cpp/fields/name-component.cc \
+  ndn-cpp/fields/name.h ndn-cpp/fields/name.cc \
+  ndn-cpp/fields/signature.h ndn-cpp/fields/signature.cc \
+  ndn-cpp/wire/base.h \
+  ndn-cpp/wire/ccnb.h ndn-cpp/wire/ccnb.cc
 
-test1_SOURCES = ndn-cpp.a test/test1.cpp
+test_encode_decode_interest_SOURCES = test/test-encode-decode-interest.cpp
+test_encode_decode_interest_LDADD = ndn-cpp.a
 
 dist_noinst_SCRIPTS = autogen.sh