diff --git a/lib/isc/tests/atomic_test.c b/lib/isc/tests/atomic_test.c
index 361c3b18d8..d38d84774b 100644
--- a/lib/isc/tests/atomic_test.c
+++ b/lib/isc/tests/atomic_test.c
@@ -313,6 +313,19 @@ ATF_TC_BODY(atomic_storeq, tc) {
 }
 #endif
 
+#if !defined(ISC_PLATFORM_HAVEXADD) && \
+    !defined(ISC_PLATFORM_HAVEXADDQ) && \
+    !defined(ISC_PLATFORM_HAVEATOMICSTOREQ)
+ATF_TC(untested);
+ATF_TC_HEAD(untested, tc) {
+	atf_tc_set_md_var(tc, "descr", "skipping aes test");
+}
+ATF_TC_BODY(untested, tc) {
+	UNUSED(tc);
+	atf_tc_skip("AES not available");
+}
+#endif /* !HAVEXADD, !HAVEXADDQ, !HAVEATOMICSTOREQ */
+
 /*
  * Main
  */
@@ -329,5 +342,11 @@ ATF_TP_ADD_TCS(tp) {
 #if defined(ISC_PLATFORM_HAVEATOMICSTOREQ)
 	ATF_TP_ADD_TC(tp, atomic_storeq);
 #endif
+#if !defined(ISC_PLATFORM_HAVEXADD) && \
+    !defined(ISC_PLATFORM_HAVEXADDQ) && \
+    !defined(ISC_PLATFORM_HAVEATOMICSTOREQ)
+	ATF_TP_ADD_TC(tp, untested);
+#endif
+
 	return (atf_no_error());
 }