diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 132543d714c61fc6d1540f0e671086929f48767f..6cc63ae3522001701bd428075240eb6538048c6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,12 +90,12 @@ minimal-windows:
   tags:
     - win
   script:
+    - export NUM_CORES=$(nproc --all)
     - source /cygdrive/c/Users/build/Miniconda3/Scripts/activate
-    - source activate pystencils_dev
-    - env
-    - conda env list
+    - source activate pystencils
+    - pip list
     - python -c "import numpy"
-    - python setup.py quicktest
+    - py.test -v -m "not (notebook or longrun)"
 
 ubuntu:
   stage: test
diff --git a/pystencils/cpu/cpujit.py b/pystencils/cpu/cpujit.py
index 5b011535826fbb364595f75ea25f2922980ad6c0..37f8b5606345dbc27ac553c1974bcbf4457c9826 100644
--- a/pystencils/cpu/cpujit.py
+++ b/pystencils/cpu/cpujit.py
@@ -160,7 +160,7 @@ def read_config():
             ('msvc_version', 'latest'),
             ('llc_command', get_llc_command() or 'llc'),
             ('arch', 'x64'),
-            ('flags', '/Ox /fp:fast /openmp /arch:avx'),
+            ('flags', '/Ox /fp:fast /OpenMP /arch:avx'),
             ('restrict_qualifier', '__restrict')
         ])
     elif platform.system().lower() == 'darwin':
diff --git a/pystencils/fd/finitedifferences.py b/pystencils/fd/finitedifferences.py
index 20d071793dfe2963a6b8740f3d3771250fc0116e..dd5c2e39d9d2a0fa161cc6b9bed3c8e80e36e38c 100644
--- a/pystencils/fd/finitedifferences.py
+++ b/pystencils/fd/finitedifferences.py
@@ -338,7 +338,7 @@ def discretize_staggered(term, symbols_to_field_dict, coordinate, coordinate_off
 
         offset = [0] * dim
         offset[coordinate] = coordinate_offset
-        offset = np.array(offset, dtype=np.int)
+        offset = np.array(offset, dtype=int)
 
         gradient = grad(symbols)[coordinate]
         substitutions.update({s: (field[offset](i) + field(i)) / 2 for i, s in enumerate(symbols)})
@@ -386,7 +386,7 @@ def discretize_divergence(vector_term, symbols_to_field_dict, dx):
 def __up_down_offsets(d, dim):
     coord = [0] * dim
     coord[d] = 1
-    up = np.array(coord, dtype=np.int)
+    up = np.array(coord, dtype=int)
     coord[d] = -1
-    down = np.array(coord, dtype=np.int)
+    down = np.array(coord, dtype=int)
     return up, down
diff --git a/pystencils/include/aesni_rand.h b/pystencils/include/aesni_rand.h
index 1e2b05bd28a01d64dcbd709d4018dcb7adfd69cd..e91101e4073901fb15081e1e0463b2f5116e40a4 100644
--- a/pystencils/include/aesni_rand.h
+++ b/pystencils/include/aesni_rand.h
@@ -1,7 +1,3 @@
-#if !defined(__AES__) || !defined(__SSE4_1__)
-#error AES-NI and SSE4.1 need to be enabled
-#endif
-
 #include <emmintrin.h> // SSE2
 #include <wmmintrin.h> // AES
 #ifdef __AVX512VL__
diff --git a/pystencils_tests/test_types.py b/pystencils_tests/test_types.py
index 381130f06b00c48707ca4f36d8b4081ceff91452..cb6bddd8dfe1b38ec94bcd0aa862a93972711655 100644
--- a/pystencils_tests/test_types.py
+++ b/pystencils_tests/test_types.py
@@ -114,8 +114,8 @@ def test_Basic_data_type():
     assert s.dtype.is_uint()
     assert s.dtype.is_complex() == 0
 
-    assert typed_symbols(("s"), np.str).dtype.is_other()
-    assert typed_symbols(("s"), np.bool).dtype.is_other()
+    assert typed_symbols(("s"), str).dtype.is_other()
+    assert typed_symbols(("s"), bool).dtype.is_other()
     assert typed_symbols(("s"), np.void).dtype.is_other()
 
     assert typed_symbols(("s"), np.float64).dtype.base_name == 'double'