diff --git a/lnd_test.go b/lnd_test.go
index c5aad144..eed2bc56 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -9081,16 +9081,15 @@ func testBidirectionalAsyncPayments(net *lntest.NetworkHarness, t *harnessTest)
 
 	// Wait for Alice and Bob receive their payments, and throw and error
 	// if something goes wrong.
-	maxTime := 60 * time.Second
 	for i := 0; i < 2; i++ {
 		select {
 		case err := <-errChan:
 			if err != nil {
 				t.Fatalf(err.Error())
 			}
-		case <-time.After(maxTime):
+		case <-time.After(lntest.AsyncBenchmarkTimeout):
 			t.Fatalf("waiting for payments to finish too long "+
-				"(%v)", maxTime)
+				"(%v)", lntest.AsyncBenchmarkTimeout)
 		}
 	}
 
diff --git a/make/testing_flags.mk b/make/testing_flags.mk
index 5d784d5a..eb5b43b1 100644
--- a/make/testing_flags.mk
+++ b/make/testing_flags.mk
@@ -33,7 +33,7 @@ endif
 ifneq ($(timeout),)
 TEST_FLAGS += -test.timeout=$(timeout)
 else
-TEST_FLAGS += -test.timeout=20m
+TEST_FLAGS += -test.timeout=30m
 endif
 
 # UNIT_TARGTED is undefined iff a specific package and/or unit test case is