diff --git a/include/wx/debug.h b/include/wx/debug.h
index c9e78c6f9f..a56d266e5c 100644
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -331,6 +331,8 @@ extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
     #define wxFAIL
     #define wxFAIL_MSG(msg)
     #define wxFAIL_COND_MSG(cond, msg)
+    #define wxFAIL_MSG_AT(msg, file, line, func)
+    #define wxFAIL_COND_MSG_AT(cond, msg, file, line, func)
 #endif  // wxDEBUG_LEVEL
 
 #if wxDEBUG_LEVEL >= 2
diff --git a/tests/misc/misctests.cpp b/tests/misc/misctests.cpp
index 7ec98633b8..ddd7063a69 100644
--- a/tests/misc/misctests.cpp
+++ b/tests/misc/misctests.cpp
@@ -125,6 +125,8 @@ void MiscTestCase::Delete()
 namespace
 {
 
+#ifdef __WXDEBUG__
+
 // helper function used just to avoid warnings about value computed not being
 // used in WX_ASSERT_FAILS_WITH_ASSERT() in StaticCast() below
 bool IsNull(void *p)
@@ -132,6 +134,8 @@ bool IsNull(void *p)
     return p == NULL;
 }
 
+#endif // __WXDEBUG__
+
 } // anonymous namespace
 
 void MiscTestCase::StaticCast()
diff --git a/tests/testprec.h b/tests/testprec.h
index d3340eff03..1dcaa0a289 100644
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -128,6 +128,7 @@ public:
     // normal build with wxDEBUG_LEVEL != 0 we can pass something not
     // evaluating to a bool at all but it then would fail to compile in
     // wxDEBUG_LEVEL == 0 case, so just don't do anything at all now).
+    #define WX_ASSERT_FAILS_WITH_ASSERT_MESSAGE(msg, code)
     #define WX_ASSERT_FAILS_WITH_ASSERT(cond)
 #endif