Index: libopencsd-0.8.3~pre/decoder/tests/build/linux/echo_test_dcd_lib/makefile
===================================================================
--- libopencsd-0.8.3~pre.orig/decoder/tests/build/linux/echo_test_dcd_lib/makefile
+++ libopencsd-0.8.3~pre/decoder/tests/build/linux/echo_test_dcd_lib/makefile
@@ -79,6 +79,6 @@ clean:
 	-rm $(OBJECTS)
 	-rm $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a
 	-rm $(DEPS)
-	-rmdir $(BUILD_DIR)
+	-rmdir $(BUILD_DIR) $(LIB_TEST_TARGET_DIR)
 
 # end of file makefile
Index: libopencsd-0.8.3~pre/decoder/tests/build/linux/snapshot_parser_lib/makefile
===================================================================
--- libopencsd-0.8.3~pre.orig/decoder/tests/build/linux/snapshot_parser_lib/makefile
+++ libopencsd-0.8.3~pre/decoder/tests/build/linux/snapshot_parser_lib/makefile
@@ -89,4 +89,4 @@ clean:
 	-rm $(OBJECTS)
 	-rm $(DEPS)
 	-rm $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a
-	-rmdir $(BUILD_DIR)
+	-rmdir $(BUILD_DIR) $(LIB_TEST_TARGET_DIR)
Index: libopencsd-0.8.3~pre/decoder/build/linux/makefile
===================================================================
--- libopencsd-0.8.3~pre.orig/decoder/build/linux/makefile
+++ libopencsd-0.8.3~pre/decoder/build/linux/makefile
@@ -187,6 +187,7 @@ clean_tests:
 	cd $(OCSD_ROOT)/tests/build/linux/snapshot_parser_lib && make clean
 	cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && make clean
 	cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && make clean
+	-rmdir $(OCSD_TESTS)/lib
 
 clean_docs:
 	-rm -r $(OCSD_ROOT)/docs/html