diff --git a/common/tests/CMakeLists.txt b/common/tests/CMakeLists.txt
index 8eae66644..b99d8d578 100644
--- a/common/tests/CMakeLists.txt
+++ b/common/tests/CMakeLists.txt
@@ -21,7 +21,6 @@
 ##############################################################################
 
 add_executable(unit-tests-common
-	logging.cpp
 	advio.cpp
 	json_buffer.cpp
 	bitset.cpp
diff --git a/common/tests/logging.cpp b/common/tests/logging.cpp
deleted file mode 100644
index c7a74e33b..000000000
--- a/common/tests/logging.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/** Logging utilities for unit test.
- *
- * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
- * @copyright 2014-2019, Steffen Vogel
- * @license GNU General Public License (version 3)
- *
- * VILLAScommon
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************************/
-
-#include <cstdarg>
-#include <memory>
-
-#include <criterion/logging.h>
-#include <criterion/options.h>
-
-#include <villas/log.hpp>
-
-using namespace villas;
-
-extern "C" {
-	/* We override criterions function here */
-	void criterion_log_noformat(enum criterion_severity severity, const char *msg);
-	void criterion_plog(enum criterion_logging_level level, const struct criterion_prefix_data *prefix, const char *msg, ...);
-	void criterion_vlog(enum criterion_logging_level level, const char *msg, va_list args);
-}
-
-static const char *color_reset = "\e[0m";
-
-struct criterion_prefix_data {
-	const char *prefix;
-	const char *color;
-};
-
-static int format_msg(char *buf, size_t buflen, const char *msg, va_list args)
-{
-	int len = vsnprintf(buf, buflen, msg, args);
-
-	/* Strip new line */
-	char *nl = strchr(buf, '\n');
-	if (nl)
-		*nl = 0;
-
-	return len;
-}
-
-void criterion_log_noformat(enum criterion_severity severity, const char *msg)
-{
-	Logger logger = logging.get("criterion");
-
-	switch (severity) {
-		case CR_LOG_WARNING:
-			logger->warn(msg);
-			break;
-
-		case CR_LOG_ERROR:
-			logger->error(msg);
-			break;
-
-		case CR_LOG_INFO:
-		default:
-			logger->info(msg);
-			break;	}
-}
-
-void criterion_vlog(enum criterion_logging_level /* level */, const char *msg, va_list args)
-{
-	char formatted_msg[1024];
-
-	//if (level < criterion_options.logging_threshold)
-	//	return;
-
-	format_msg(formatted_msg, sizeof(formatted_msg), msg, args);
-
-	Logger logger = logging.get("test");
-	logger->info(formatted_msg);
-}
-
-void criterion_plog(enum criterion_logging_level /* level */, const struct criterion_prefix_data *prefix, const char *msg, ...)
-{
-	char formatted_msg[1024];
-
-	va_list args;
-
-	//if (level < criterion_options.logging_threshold)
-	//	return;
-
-	va_start(args, msg);
-	format_msg(formatted_msg, sizeof(formatted_msg), msg, args);
-	va_end(args);
-
-	Logger logger = logging.get("test");
-
-	if      (!strcmp(prefix->prefix, "----") && !strcmp(prefix->color, "\33[0;34m"))
-		logger->info(formatted_msg);
-	else if (!strcmp(prefix->prefix, "----") && !strcmp(prefix->color,  "\33[1;30m"))
-		logger->debug(formatted_msg);
-	else if (!strcmp(prefix->prefix, "===="))
-		logger->info(formatted_msg);
-	else if (!strcmp(prefix->prefix, "WARN") || strstr(formatted_msg, "Warning"))
-		logger->warn(formatted_msg);
-	else if (!strcmp(prefix->prefix, "ERR ") || strstr(formatted_msg, "Failed"))
-		logger->error(formatted_msg);
-	else if (!strcmp(prefix->prefix, "RUN "))
-		logger->info("{}Run:{} {}", prefix->color, color_reset, formatted_msg);
-	else if (!strcmp(prefix->prefix, "SKIP"))
-		logger->info("{}Skip:{} {}", prefix->color, color_reset, formatted_msg);
-	else if (!strcmp(prefix->prefix, "PASS"))
-		logger->info("{}Pass:{} {}", prefix->color, color_reset, formatted_msg);
-	else if (!strcmp(prefix->prefix, "FAIL"))
-		logger->error("{}Fail:{} {}", prefix->color, color_reset, formatted_msg);
-	else
-		logger->info(formatted_msg);
-}