diff --git a/ext/aes/meson.build b/ext/aes/meson.build
index c83049234a..a200b8d7d2 100644
--- a/ext/aes/meson.build
+++ b/ext/aes/meson.build
@@ -5,11 +5,6 @@ aes_sources = [
   'gstaesdec.c',
 ]
 
-aes_option = get_option('aes')
-if aes_option.disabled()
-  subdir_done()
-endif
-
 aes_cargs = []
 aes_dep = dependency('openssl', required : get_option('aes'))
 if aes_dep.found()
diff --git a/tests/check/meson.build b/tests/check/meson.build
index 713b999338..195761b550 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -18,12 +18,11 @@ nalutils_dep = gstcodecparsers_dep.partial_dependency (compile_args: true, inclu
 enable_gst_play_tests = get_option('gst_play_tests')
 libsoup_dep = dependency('libsoup-2.4', version : '>=2.48', required : enable_gst_play_tests,
   fallback : ['libsoup', 'libsoup_dep'])
-aes_dep = dependency('openssl', required : false)
 
 # name, condition when to skip the test and extra dependencies
 base_tests = [
-  [['elements/aesenc.c'], false, [aes_dep]],
-  [['elements/aesdec.c'], false, [aes_dep]],
+  [['elements/aesenc.c'], not aes_dep.found(), [aes_dep]],
+  [['elements/aesdec.c'], not aes_dep.found(), [aes_dep]],
   [['elements/aiffparse.c']],
   [['elements/asfmux.c']],
   [['elements/autoconvert.c']],