diff --git a/test/test-list.h b/test/test-list.h
index 37746b8e..3ad8d32b 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -722,7 +722,14 @@ TASK_LIST_START
   TEST_ENTRY  (fs_read_write_null_arguments)
   TEST_ENTRY  (threadpool_queue_work_simple)
   TEST_ENTRY  (threadpool_queue_work_einval)
+#if defined(__PPC__) || defined(__PPC64__)  /* For linux PPC and AIX */
+  /* pthread_join takes a while, especially on AIX.
+   * Therefore being gratuitous with timeout.
+   */
+  TEST_ENTRY_CUSTOM (threadpool_multiple_event_loops, 0, 0, 120000)
+#else
   TEST_ENTRY  (threadpool_multiple_event_loops)
+#endif
   TEST_ENTRY  (threadpool_cancel_getaddrinfo)
   TEST_ENTRY  (threadpool_cancel_getnameinfo)
   TEST_ENTRY  (threadpool_cancel_work)
diff --git a/test/test-thread.c b/test/test-thread.c
index 94524ae9..10bec3fe 100644
--- a/test/test-thread.c
+++ b/test/test-thread.c
@@ -123,17 +123,12 @@ static void do_work(void* arg) {
     getaddrinfo_do(req);
   }
 
-/* Disable fs work on AIX as there are known issues.
- * See: Readme.md AIX Notes
- */
-#ifndef _AIX
   for (i = 0; i < ARRAY_SIZE(fs_reqs); i++) {
     struct fs_req* req = fs_reqs + i;
     req->counter = 16;
     req->loop = loop;
     fs_do(req);
   }
-#endif
 
   r = uv_run(loop, UV_RUN_DEFAULT);
   ASSERT(r == 0);