diff --git a/_unittests/ut__skl2onnx/test_sklearn_pipeline.py b/_unittests/ut__skl2onnx/test_sklearn_pipeline.py
index 4b8dce6bf..85cd7a221 100644
--- a/_unittests/ut__skl2onnx/test_sklearn_pipeline.py
+++ b/_unittests/ut__skl2onnx/test_sklearn_pipeline.py
@@ -134,8 +134,8 @@ def test_combine_inputs_floats_ints(self):
             model,
             "pipeline",
             [
-                ("input1", Int64TensorType([None, 1])),
                 ("input2", FloatTensorType([None, 1])),
+                ("input1", Int64TensorType([None, 1])),
             ],
         )
         self.assertTrue(
diff --git a/_unittests/ut_plotting/test_plotting_onnx.py b/_unittests/ut_plotting/test_plotting_onnx.py
index ce6bf8528..f4abf3267 100644
--- a/_unittests/ut_plotting/test_plotting_onnx.py
+++ b/_unittests/ut_plotting/test_plotting_onnx.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@brief      test log(time=2s)
+@brief      test log(time=3s)
 """
 import os
 import warnings
diff --git a/_unittests/ut_testing/test_experimental.py b/_unittests/ut_testing/test_experimental.py
index df34bd1f3..9b441cf7e 100644
--- a/_unittests/ut_testing/test_experimental.py
+++ b/_unittests/ut_testing/test_experimental.py
@@ -1,5 +1,5 @@
 """
-@brief      test log(time=2s)
+@brief      test log(time=6s)
 """
 import unittest
 import numpy
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7cbe67f7d..e8ddac46d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -47,10 +47,14 @@ jobs:
     displayName: 'Build package inplace'
   - script: python -u setup.py unittests -g ".*((LONG)|(SKIP)|(notebooks)).*"
     displayName: 'Runs Unit Tests'
-  - script: python -u setup.py bdist_wheel
-    displayName: 'Build wheel'
-  #- script: python -u setup.py build_sphinx
-  #  displayName: 'Builds Documentation'
+  - script: |
+      python -m pip install cibuildwheel
+      export CIBW_BEFORE_BUILD=pip install .
+      export CIBW_BEFORE_BUILD=pip install pybind11 cython numpy scipy pyquickhelper scikit-learn pandas pandas_streaming onnx
+      export CIBW_BUILD="cp37-manylinux_x86_64"
+      # cp38-manylinux_x86_64  cp39-manylinux_x86_64: fails...
+      python -m cibuildwheel --output-dir dist/wheelhouse --platform linux
+    displayName: 'Build Package many'
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'wheel-linux-$(python.version)'
@@ -79,7 +83,8 @@ jobs:
     displayName: 'gcc version'
   - script: brew install libomp
     displayName: 'Install omp'
-  - script: brew install p7zip
+  - script: brew upgrade p7zip
+    continueOnError: true
     displayName: 'Install p7zip'
   - script: brew install pandoc
     displayName: 'Install Pandoc'
@@ -111,9 +116,53 @@ jobs:
     displayName: 'Build package inplace'
   - script: python -u setup.py unittests -g ".*((LONG)|(SKIP)|(notebooks)).*"
     displayName: 'Runs Unit Tests'
-  - script: python -u setup.py bdist_wheel
-    displayName: 'Build wheel'
+  - script: |
+      python -m pip install cibuildwheel
+      export CIBW_BEFORE_BUILD="pip install ."
+      export CIBW_BEFORE_BUILD="pip install pybind11 cython numpy scipy pyquickhelper scikit-learn pandas pandas_streaming onnx"
+      export CIBW_BUILD="cp37-macosx_x86_64 cp38-macosx_x86_64"
+      # cp39-macosx_x86_64 fails due to missing dependencies
+      python -m cibuildwheel --output-dir dist/wheelhouse
+    displayName: 'Build Package many'
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'wheel-mac-$(python.version)'
       targetPath: 'dist'
+
+- job: 'TestWindows'
+  pool:
+    vmImage: 'windows-latest'
+  strategy:
+    matrix:
+      Python38-Windows:
+        python.version: '3.8'
+    maxParallel: 3
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '$(python.version)'
+      architecture: 'x64'
+  - script: python -m pip install --upgrade pip setuptools wheel
+    displayName: 'Install tools'
+  - script: pip install -r requirements.txt
+    displayName: 'Install Requirements'
+  - script: pip install onnxruntime
+    displayName: 'Install onnxruntime'
+  - script: python -c "import platform;print(platform.version())"
+    displayName: 'Platform'
+  - script: python -u setup.py build_ext --inplace
+    displayName: 'Build inplace'
+  - script: python -u setup.py unittests -d 2
+    displayName: 'Runs Unit Tests'
+  - script: |
+      python -m pip install cibuildwheel
+      set CIBW_BEFORE_BUILD=pip install .
+      set CIBW_BEFORE_BUILD=pip install pybind11 cython numpy scipy pyquickhelper scikit-learn pandas pandas_streaming onnx
+      set CIBW_BUILD=cp37-win_amd64 cp38-win_amd64
+      # cp39-win_amd64 fails, onnx is missing
+      python -m cibuildwheel --output-dir dist/wheelhouse
+    displayName: 'Build Package many'
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: 'wheel-windows-$(python.version)'
+      targetPath: 'dist'