diff --git a/tests/test-barrier.c b/tests/test-barrier.c
index 3bc5291cc..fb0ab0e69 100644
--- a/tests/test-barrier.c
+++ b/tests/test-barrier.c
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+#include <config.h>
+#undef NDEBUG
 #include <getopt.h>
 
-#include <config.h>
-
-#include "ovs-thread.h"
-#include "ovs-rcu.h"
 #include "ovstest.h"
+#include "ovs-rcu.h"
+#include "ovs-thread.h"
 #include "random.h"
 #include "util.h"
 
diff --git a/tests/test-id-fpool.c b/tests/test-id-fpool.c
index 25275d9ae..27800aa9b 100644
--- a/tests/test-id-fpool.c
+++ b/tests/test-id-fpool.c
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <config.h>
 #undef NDEBUG
 #include <assert.h>
 #include <getopt.h>
 #include <string.h>
-
-#include <config.h>
+#include <sys/time.h>
 
 #include "command-line.h"
 #include "id-fpool.h"
diff --git a/tests/test-mpsc-queue.c b/tests/test-mpsc-queue.c
index a38bf9e6d..16aa804a0 100644
--- a/tests/test-mpsc-queue.c
+++ b/tests/test-mpsc-queue.c
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <config.h>
 #undef NDEBUG
 #include <assert.h>
 #include <getopt.h>
 #include <string.h>
-
-#include <config.h>
+#include <sys/time.h>
 
 #include "command-line.h"
 #include "guarded-list.h"