Index: tests/concurrent/examples/boundedBufferEXT.cfa
===================================================================
--- tests/concurrent/examples/boundedBufferEXT.cfa	(revision a3ade94ddb746f47182c794855a010a21a22fe48)
+++ tests/concurrent/examples/boundedBufferEXT.cfa	(revision 843ca9f904c053c11f852ed87d36325c5a41d9c0)
@@ -1,5 +1,5 @@
 //
 // Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
-// 
+//
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
@@ -87,9 +87,10 @@
 }
 
+enum { Prods = 4, Cons = 5 };
+Producer * prods[Prods];
+Consumer * cons[Cons];
+
 int main() {
 	Buffer(int) buffer;
-	enum { Prods = 4, Cons = 5 };
-	Producer * prods[Prods];
-	Consumer * cons[Cons];
 	int sums[Cons];
 	int i;
Index: tests/test.py
===================================================================
--- tests/test.py	(revision a3ade94ddb746f47182c794855a010a21a22fe48)
+++ tests/test.py	(revision 843ca9f904c053c11f852ed87d36325c5a41d9c0)
@@ -116,5 +116,5 @@
 	parser.add_argument('--arch', help='Test for specific architecture', type=comma_separated(str), default=None)
 	parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
-	parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
+	parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=120)
 	parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
 	parser.add_argument('--timeout-with-gdb', help='Instead of killing the command when it times out, orphan it and print process id to allow gdb to attach', type=yes_no, default="no")