diff --git a/Makefile.am b/Makefile.am
index 3d0e7622..f8da0baa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,9 @@ EXTRA_DIST = LICENSE \
 	     README.md \
 	     VERSION
 
+test:
+	$(MAKE) -C src/lib/ebus/test
+
 distclean-local:
 	-rm -rf autom4te.cache
 	-rm -f aclocal.m4
diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am
index 821cb379..d6b4395a 100644
--- a/src/ebusd/Makefile.am
+++ b/src/ebusd/Makefile.am
@@ -1,7 +1,4 @@
-AM_CXXFLAGS = -fpic \
-	      -Wall \
-	      -Wextra \
-	      -Wconversion \
+AM_CXXFLAGS = -Wconversion \
 	      -isystem$(top_srcdir)/src/lib/utils \
 	      -isystem$(top_srcdir)/src/lib/ebus \
 	      -DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/src/lib/ebus/Makefile.am b/src/lib/ebus/Makefile.am
index 2c70be41..0f4a9bf4 100644
--- a/src/lib/ebus/Makefile.am
+++ b/src/lib/ebus/Makefile.am
@@ -1,7 +1,4 @@
-AM_CXXFLAGS = -fpic \
-	      -Wall \
-	      -Wextra \
-	      -Wno-unused-parameter \
+AM_CXXFLAGS = -Wno-unused-parameter \
 	      -Wconversion
 
 noinst_LIBRARIES = libebus.a
diff --git a/src/lib/ebus/test/Makefile.am b/src/lib/ebus/test/Makefile.am
index c8ce303d..559de51a 100644
--- a/src/lib/ebus/test/Makefile.am
+++ b/src/lib/ebus/test/Makefile.am
@@ -1,7 +1,4 @@
-AM_CXXFLAGS = -fpic \
-	      -Wall \
-	      -Wextra \
-	      -isystem$(top_srcdir)/src/lib/ebus
+AM_CXXFLAGS = -isystem$(top_srcdir)/src/lib/ebus
 
 noinst_PROGRAMS = test_filereader \
 		  test_device \
diff --git a/src/lib/utils/Makefile.am b/src/lib/utils/Makefile.am
index 5f880a01..262980fe 100644
--- a/src/lib/utils/Makefile.am
+++ b/src/lib/utils/Makefile.am
@@ -1,7 +1,4 @@
-AM_CXXFLAGS = -fpic \
-	      -Wall \
-	      -Wextra \
-	      -Wconversion
+AM_CXXFLAGS = -Wconversion
 
 noinst_LIBRARIES = libutils.a
 
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 47c48ab1..f52008ea 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,7 +1,4 @@
-AM_CXXFLAGS = -fpic \
-	      -Wall \
-	      -Wextra \
-	      -isystem$(top_srcdir)/src/lib/utils \
+AM_CXXFLAGS = -isystem$(top_srcdir)/src/lib/utils \
 	      -isystem$(top_srcdir)/src/lib/ebus
 
 bin_PROGRAMS = ebusctl \