diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 7a8797107..e4fbb17d7 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -412,10 +412,6 @@
 #error "MBEDTLS_MEMORY_DEBUG defined, but not all prerequisites"
 #endif
 
-#if defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_HAVE_ASM)
-#error "MBEDTLS_PADLOCK_C defined, but not all prerequisites"
-#endif
-
 #if defined(MBEDTLS_PEM_PARSE_C) && !defined(MBEDTLS_BASE64_C)
 #error "MBEDTLS_PEM_PARSE_C defined, but not all prerequisites"
 #endif
diff --git a/library/aes.c b/library/aes.c
index bf7d6cb4c..52e361a28 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -47,11 +47,14 @@
 #endif
 #endif
 
-#if defined(MBEDTLS_HAVE_ASM) && defined(__i386__) && \
-    !defined(MBEDTLS_HAVE_ASAN)
+#if defined(__i386__)
 #if defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
 #error "MBEDTLS_AES_USE_HARDWARE_ONLY not supported yet for i386."
 #endif
+
+#if defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_HAVE_ASM)
+#error "MBEDTLS_PADLOCK_C defined, but not all prerequisites"
+#endif
 #endif
 
 #if defined(MBEDTLS_PADLOCK_C)
diff --git a/library/padlock.c b/library/padlock.c
index 38d110e0b..f42c40ff9 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -33,10 +33,6 @@
 
 #if defined(MBEDTLS_HAVE_X86)
 
-#if defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
-#error "MBEDTLS_PADLOCK_C defined, but not all prerequisites"
-#endif
-
 /*
  * PadLock detection routine
  */