diff --git a/pystencils_tests/test_random.py b/pystencils_tests/test_random.py
index 9a0724cf16468d16350667aa67e96b8c815bc366..cf1de7c27f797b8905e8c03eb4a334d1fecebcda 100644
--- a/pystencils_tests/test_random.py
+++ b/pystencils_tests/test_random.py
@@ -14,10 +14,10 @@ RNGs = {('philox', 'float'): PhiloxFourFloats, ('philox', 'double'): PhiloxTwoDo
 instruction_sets = get_supported_instruction_sets()
 if get_compiler_config()['os'] == 'windows':
     # skip instruction sets supported by CPU but not the compiler
-    if '/arch:avx2' not in get_compiler_config()['flags'].lower() and \
-       '/arch:avx512' not in get_compiler_config()['flags'].lower():
+    if 'avx' in instruction_sets and ('/arch:avx2' not in get_compiler_config()['flags'].lower()
+                                      or '/arch:avx512' not in get_compiler_config()['flags'].lower()):
         instruction_sets.remove('avx')
-    if '/arch:avx512' not in get_compiler_config()['flags'].lower():
+    if 'avx512' in instruction_sets and '/arch:avx512' not in get_compiler_config()['flags'].lower():
         instruction_sets.remove('avx512')