diff --git a/buildbot/testlist.cfg b/buildbot/testlist.cfg
index e60fea347dc9..01aa2bd10c15 100644
--- a/buildbot/testlist.cfg
+++ b/buildbot/testlist.cfg
@@ -11,7 +11,7 @@
 :test_exception_handling
 :test_group
 :test_h_item
-:test_handler
+#:test_handler
 :test_header
 :test_hierarchical
 :test_id
@@ -20,7 +20,7 @@
 :test_item
 :test_kernel
 :test_kernel_args
-:test_math_builtin_api
+#:test_math_builtin_api
 :test_multi_ptr
 :test_nd_item
 :test_nd_range
@@ -38,8 +38,7 @@
 :test_vector_api
 :test_vector_constructors
 :test_vector_load_store
-# Disable test to speedup testing until JIT is optimized
 #:test_vector_operators
 :test_vector_swizzle_assignment
-:test_vector_swizzles
-:test_vector_swizzles_opencl
+#:test_vector_swizzles
+#:test_vector_swizzles_opencl