diff --git a/Makefile.am b/Makefile.am
index f582bd8..335243d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,9 +37,6 @@ MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 
 ACLOCAL_AMFLAGS		= -I m4
 
-# For test suite
-export SOCKETDIR
-
 dist_doc_DATA		= COPYING INSTALL README.markdown
 
 SUBDIRS			= include lib docs tools tests examples
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a23b78..bc70f39 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,6 +21,8 @@ MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST =
 CLEANFILES =
 
+export SOCKETDIR
+
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_PROGRAMS = bmc bmcpt bms rbreader rbwriter \