diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index fbfa647fe9..25c7f0bb75 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -469,10 +469,11 @@ stages:
       - Docker_2_13
       - Docker_2_14
       - Docker_community_devel
-      - Generic_devel
-      - Generic_2_11
-      - Generic_2_12
-      - Generic_2_13
-      - Generic_2_14
+# Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
+#      - Generic_devel
+#      - Generic_2_11
+#      - Generic_2_12
+#      - Generic_2_13
+#      - Generic_2_14
     jobs:
       - template: templates/coverage.yml
diff --git a/tests/integration/targets/one_host/aliases b/tests/integration/targets/one_host/aliases
index 02a31bcd55..100ba0f979 100644
--- a/tests/integration/targets/one_host/aliases
+++ b/tests/integration/targets/one_host/aliases
@@ -4,4 +4,4 @@
 
 azp/generic/1
 cloud/opennebula
-disabled  # FIXME
+disabled  # FIXME  - when this is fixed, also re-enable the generic tests in CI!
diff --git a/tests/integration/targets/one_template/aliases b/tests/integration/targets/one_template/aliases
index 02a31bcd55..100ba0f979 100644
--- a/tests/integration/targets/one_template/aliases
+++ b/tests/integration/targets/one_template/aliases
@@ -4,4 +4,4 @@
 
 azp/generic/1
 cloud/opennebula
-disabled  # FIXME
+disabled  # FIXME  - when this is fixed, also re-enable the generic tests in CI!