diff --git a/lasso/logging.h b/lasso/logging.h
index d008a73b..05413211 100644
--- a/lasso/logging.h
+++ b/lasso/logging.h
@@ -92,9 +92,9 @@ static inline void message(GLogLevelFlags level, const char *format, ...)
 
 #if defined(__GNUC__)
 #  define warning(format, args...) \
-	message(G_LOG_LEVEL_DEBUG, format, ##args)
+	message(G_LOG_LEVEL_WARNING, format, ##args)
 #elif defined(HAVE_VARIADIC_MACROS)
-#  define warning(...)     message(G_LOG_LEVEL_DEBUG, __VA_ARGS__)
+#  define warning(...)     message(G_LOG_LEVEL_WARNING, __VA_ARGS__)
 #else
 static inline void warning(const char *format, ...)
 {
@@ -109,9 +109,9 @@ static inline void warning(const char *format, ...)
 
 #if defined(__GNUC__)
 #  define critical(format, args...) \
-	message(G_LOG_LEVEL_DEBUG, format, ##args)
+	message(G_LOG_LEVEL_CRITICAL, format, ##args)
 #elif defined(HAVE_VARIADIC_MACROS)
-#  define critical(...)     message(G_LOG_LEVEL_DEBUG, __VA_ARGS__)
+#  define critical(...)     message(G_LOG_LEVEL_CRITICAL, __VA_ARGS__)
 #else
 static inline void critical(const char *format, ...)
 {
@@ -126,9 +126,9 @@ static inline void critical(const char *format, ...)
 
 #if defined(__GNUC__)
 #  define error(format, args...) \
-	message(G_LOG_LEVEL_DEBUG, format, ##args)
+	message(G_LOG_LEVEL_ERROR, format, ##args)
 #elif defined(HAVE_VARIADIC_MACROS)
-#  define error(...)     message(G_LOG_LEVEL_DEBUG, __VA_ARGS__)
+#  define error(...)     message(G_LOG_LEVEL_ERROR, __VA_ARGS__)
 #else
 static inline void error(const char *format, ...)
 {
diff --git a/tests/login_tests.c b/tests/login_tests.c
index 199c58cb..e006e007 100644
--- a/tests/login_tests.c
+++ b/tests/login_tests.c
@@ -295,7 +295,7 @@ START_TEST(test02_serviceProviderLogin)
 	fail_unless(found != NULL, "We must find an InResponseTo attribute");
 	found[sizeof("InResponseTo=\"")] = '?';
 	lasso_set_flag("no-verify-signature");
-	begin_check_do_log(G_LOG_LEVEL_DEBUG, " If inResponseTo attribute is present, a matching "
+	begin_check_do_log(G_LOG_LEVEL_CRITICAL, " If inResponseTo attribute is present, a matching "
 			"request must be present too in the LassoLogin object", TRUE);
 	check_not_equals(lasso_login_process_response_msg(spLoginContext, soapResponseMsg), 0);
 	end_check_do_log();