diff --git a/tests/ivi-layout-test-plugin.c b/tests/ivi-layout-test-plugin.c
index 196e7f09..75ce1436 100644
--- a/tests/ivi-layout-test-plugin.c
+++ b/tests/ivi-layout-test-plugin.c
@@ -47,7 +47,7 @@ struct test_context;
 struct runner_test {
 	const char *name;
 	void (*run)(struct test_context *);
-} __attribute__ ((aligned (32)));
+} __attribute__ ((aligned (64)));
 
 #define RUNNER_TEST(name)					\
 	static void runner_func_##name(struct test_context *);	\
diff --git a/tests/weston-test-runner.h b/tests/weston-test-runner.h
index 7f736ec9..58d2b7ee 100644
--- a/tests/weston-test-runner.h
+++ b/tests/weston-test-runner.h
@@ -55,7 +55,7 @@ struct weston_test_entry {
 	const void *table_data;
 	size_t element_size;
 	int n_elements;
-} __attribute__ ((aligned (32)));
+} __attribute__ ((aligned (64)));
 
 #define TEST_BEGIN(name, arg)						\
 	static void name(arg)
diff --git a/tools/zunitc/inc/zunitc/zunitc_impl.h b/tools/zunitc/inc/zunitc/zunitc_impl.h
index f0533689..0bb5acb4 100644
--- a/tools/zunitc/inc/zunitc/zunitc_impl.h
+++ b/tools/zunitc/inc/zunitc/zunitc_impl.h
@@ -77,7 +77,7 @@ struct zuc_registration {
 	zucimpl_test_fn fn;		/**< function implementing base test. */
 	zucimpl_test_fn_f fn_f;	/**< function implementing test with
 					   fixture. */
-} __attribute__ ((aligned (32)));
+} __attribute__ ((aligned (64)));
 
 
 int