diff --git a/tests/usr.bin/c++/t_asan_double_free.sh b/tests/usr.bin/c++/t_asan_double_free.sh
index 0231edfa0baf..6b3575fd4d3f 100644
--- a/tests/usr.bin/c++/t_asan_double_free.sh
+++ b/tests/usr.bin/c++/t_asan_double_free.sh
@@ -1,4 +1,4 @@
-#	$NetBSD: t_asan_double_free.sh,v 1.1 2018/04/04 23:53:26 kamil Exp $
+#	$NetBSD: t_asan_double_free.sh,v 1.2 2018/07/16 07:27:26 kamil Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -202,10 +202,10 @@ atf_init_test_cases()
 	}
 
 	atf_add_test_case double_free
-	atf_add_test_case double_free_profile
+#	atf_add_test_case double_free_profile
 	atf_add_test_case double_free_pic
 	atf_add_test_case double_free_pie
-	atf_add_test_case double_free32
+#	atf_add_test_case double_free32
 	# static option not supported
 	# -static and -fsanitize=address can't be used together for compilation
 	# (gcc version  5.4.0 and clang 7.1) tested on April 2nd 2018.
diff --git a/tests/usr.bin/c++/t_asan_global_buffer_overflow.sh b/tests/usr.bin/c++/t_asan_global_buffer_overflow.sh
index 786e1b168321..41e81657055e 100644
--- a/tests/usr.bin/c++/t_asan_global_buffer_overflow.sh
+++ b/tests/usr.bin/c++/t_asan_global_buffer_overflow.sh
@@ -1,4 +1,4 @@
-#	$NetBSD: t_asan_global_buffer_overflow.sh,v 1.1 2018/04/04 23:53:26 kamil Exp $
+#	$NetBSD: t_asan_global_buffer_overflow.sh,v 1.2 2018/07/16 07:27:26 kamil Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -201,10 +201,10 @@ atf_init_test_cases()
 	}
 
 	atf_add_test_case global_buffer_overflow
-	atf_add_test_case global_buffer_overflow_profile
+#	atf_add_test_case global_buffer_overflow_profile
 	atf_add_test_case global_buffer_overflow_pic
 	atf_add_test_case global_buffer_overflow_pie
-	atf_add_test_case global_buffer_overflow32
+#	atf_add_test_case global_buffer_overflow32
 	# static option not supported
 	# -static and -fsanitize=address can't be used together for compilation
 	# (gcc version  5.4.0 and clang 7.1) tested on April 2nd 2018.
diff --git a/tests/usr.bin/c++/t_asan_heap_overflow.sh b/tests/usr.bin/c++/t_asan_heap_overflow.sh
index 1b485eb7c717..bfe7eb5fff35 100644
--- a/tests/usr.bin/c++/t_asan_heap_overflow.sh
+++ b/tests/usr.bin/c++/t_asan_heap_overflow.sh
@@ -1,4 +1,4 @@
-#	$NetBSD: t_asan_heap_overflow.sh,v 1.1 2018/04/04 23:53:26 kamil Exp $
+#	$NetBSD: t_asan_heap_overflow.sh,v 1.2 2018/07/16 07:27:26 kamil Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -202,10 +202,10 @@ atf_init_test_cases()
 	}
 
 	atf_add_test_case heap_overflow
-	atf_add_test_case heap_overflow_profile
+#	atf_add_test_case heap_overflow_profile
 	atf_add_test_case heap_overflow_pic
 	atf_add_test_case heap_overflow_pie
-	atf_add_test_case heap_overflow32
+#	atf_add_test_case heap_overflow32
 	# static option not supported
 	# -static and -fsanitize=address can't be used together for compilation
 	# (gcc version  5.4.0 and clang 7.1) tested on April 2nd 2018.
diff --git a/tests/usr.bin/c++/t_asan_off_by_one.sh b/tests/usr.bin/c++/t_asan_off_by_one.sh
index 8cde36cec379..a3e257afc55a 100644
--- a/tests/usr.bin/c++/t_asan_off_by_one.sh
+++ b/tests/usr.bin/c++/t_asan_off_by_one.sh
@@ -1,4 +1,4 @@
-#	$NetBSD: t_asan_off_by_one.sh,v 1.1 2018/04/04 23:53:26 kamil Exp $
+#	$NetBSD: t_asan_off_by_one.sh,v 1.2 2018/07/16 07:27:26 kamil Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -223,10 +223,10 @@ atf_init_test_cases()
 	}
 
 	atf_add_test_case off_by_one
-	atf_add_test_case off_by_one_profile
+#	atf_add_test_case off_by_one_profile
 	atf_add_test_case off_by_one_pic
 	atf_add_test_case off_by_one_pie
-	atf_add_test_case off_by_one32
+#	atf_add_test_case off_by_one32
 	# static option not supported 
 	# -static and -fsanitize=address can't be used together for compilation
 	# (gcc version  5.4.0 and clang 7.1) tested on April 2nd 2018.
diff --git a/tests/usr.bin/c++/t_asan_poison.sh b/tests/usr.bin/c++/t_asan_poison.sh
index b54eda23e38b..c763a90584cb 100644
--- a/tests/usr.bin/c++/t_asan_poison.sh
+++ b/tests/usr.bin/c++/t_asan_poison.sh
@@ -1,4 +1,4 @@
-#	$NetBSD: t_asan_poison.sh,v 1.1 2018/04/11 03:25:25 kamil Exp $
+#	$NetBSD: t_asan_poison.sh,v 1.2 2018/07/16 07:27:26 kamil Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -267,10 +267,10 @@ atf_init_test_cases()
 	}
 
 	atf_add_test_case poison
-	atf_add_test_case poison_profile
+#	atf_add_test_case poison_profile
 	atf_add_test_case poison_pic
 	atf_add_test_case poison_pie
-	atf_add_test_case poison32
+#	atf_add_test_case poison32
 	# static option not supported
 	# -static and -fsanitize=address can't be used together for compilation
 	# (gcc version  5.4.0 and clang 7.1) tested on April 2nd 2018.
diff --git a/tests/usr.bin/c++/t_asan_uaf.sh b/tests/usr.bin/c++/t_asan_uaf.sh
index 5f1635df42df..4dac7832e02a 100644
--- a/tests/usr.bin/c++/t_asan_uaf.sh
+++ b/tests/usr.bin/c++/t_asan_uaf.sh
@@ -1,4 +1,4 @@
-#	$NetBSD: t_asan_uaf.sh,v 1.1 2018/04/04 23:53:26 kamil Exp $
+#	$NetBSD: t_asan_uaf.sh,v 1.2 2018/07/16 07:27:26 kamil Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -195,10 +195,10 @@ atf_init_test_cases()
 	}
 
 	atf_add_test_case uaf
-	atf_add_test_case uaf_profile
+#	atf_add_test_case uaf_profile
 	atf_add_test_case uaf_pic
 	atf_add_test_case uaf_pie
-	atf_add_test_case uaf32
+#	atf_add_test_case uaf32
 	# static option not supported 
 	# -static and -fsanitize=address can't be used together for compilation
 	# (gcc version 5.4.0 and clang 7.1) tested on April 2nd 2018.
diff --git a/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh b/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh
index 8823241e7529..4ac7d03ee182 100644
--- a/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh
+++ b/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh
@@ -190,8 +190,8 @@ atf_init_test_cases()
 		return 0
 	}
 	atf_add_test_case int_add_overflow
-	atf_add_test_case int_add_overflow_profile
+#	atf_add_test_case int_add_overflow_profile
 	atf_add_test_case int_add_overflow_pie
 	atf_add_test_case int_add_overflow_pic
-	atf_add_test_case int_add_overflow32
+#	atf_add_test_case int_add_overflow32
 }
diff --git a/tests/usr.bin/c++/t_ubsan_int_divzero.sh b/tests/usr.bin/c++/t_ubsan_int_divzero.sh
index 379d6a382e6a..8382ba43540a 100644
--- a/tests/usr.bin/c++/t_ubsan_int_divzero.sh
+++ b/tests/usr.bin/c++/t_ubsan_int_divzero.sh
@@ -183,8 +183,8 @@ atf_init_test_cases()
 		return 0
 	}
 	atf_add_test_case int_divzero
-	atf_add_test_case int_divzero_profile
+#	atf_add_test_case int_divzero_profile
 	atf_add_test_case int_divzero_pie
 	atf_add_test_case int_divzero_pic
-	atf_add_test_case int_divzero32
+#	atf_add_test_case int_divzero32
 }
diff --git a/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh b/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh
index dc6d72c0383b..da9d2fabe0a5 100644
--- a/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh
+++ b/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh
@@ -190,8 +190,8 @@ atf_init_test_cases()
 		return 0
 	}
 	atf_add_test_case int_neg_overflow
-	atf_add_test_case int_neg_overflow_profile
+#	atf_add_test_case int_neg_overflow_profile
 	atf_add_test_case int_neg_overflow_pie
 	atf_add_test_case int_neg_overflow_pic
-	atf_add_test_case int_neg_overflow32
+#	atf_add_test_case int_neg_overflow32
 }
diff --git a/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh b/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh
index 9dcedc856620..5d87568d1728 100644
--- a/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh
+++ b/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh
@@ -190,8 +190,8 @@ atf_init_test_cases()
 		return 0
 	}
 	atf_add_test_case int_sub_overflow
-	atf_add_test_case int_sub_overflow_profile
+#	atf_add_test_case int_sub_overflow_profile
 	atf_add_test_case int_sub_overflow_pie
 	atf_add_test_case int_sub_overflow_pic
-	atf_add_test_case int_sub_overflow32
+#	atf_add_test_case int_sub_overflow32
 }
diff --git a/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh b/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh
index 7d0acb0475bb..ab67486d9e52 100644
--- a/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh
+++ b/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh
@@ -187,8 +187,8 @@ atf_init_test_cases()
 		return 0
 	}
 	atf_add_test_case vla_out_of_bounds
-	atf_add_test_case vla_out_of_bounds_profile
+#	atf_add_test_case vla_out_of_bounds_profile
 	atf_add_test_case vla_out_of_bounds_pie
 	atf_add_test_case vla_out_of_bounds_pic
-	atf_add_test_case vla_out_of_bounds32
+#	atf_add_test_case vla_out_of_bounds32
 }