diff --git a/guththila/tests/Makefile.am b/guththila/tests/Makefile.am
new file mode 100644
index 0000000..959bf9b
--- /dev/null
+++ b/guththila/tests/Makefile.am
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+TESTS = test_guththila test_attribute
+noinst_PROGRAMS = test_guththila test_attribute
+check_PROGRAMS = test_guththila test_attribute
+SUBDIRS =
+
+test_guththila_SOURCES = test_guththila.cc
+
+AM_CPPFLAGS = -I$(top_builddir)/include \
+				-I ../../util/include
+
+test_guththila_LDADD = \
+				 $(top_builddir)/src/libguththila.la \
+				 ../../util/src/libaxutil.la \
+				 $(top_builddir)/$(GTEST)/libgtest.a \
+				 $(top_builddir)/$(GTEST)/libgtest_main.a
+
+test_attribute_SOURCES = test_attribute.cc
+
+test_attribute_LDADD = \
+				 $(top_builddir)/src/libguththila.la \
+				 ../../util/src/libaxutil.la \
+				 $(top_builddir)/$(GTEST)/libgtest.a \
+				 $(top_builddir)/$(GTEST)/libgtest_main.a