diff --git a/lntest/itest/macaroons.go b/lntest/itest/lnd_macaroons_test.go
similarity index 100%
rename from lntest/itest/macaroons.go
rename to lntest/itest/lnd_macaroons_test.go
diff --git a/lntest/itest/lnd_multi-hop-error-propagation.go b/lntest/itest/lnd_multi-hop-error-propagation_test.go
similarity index 100%
rename from lntest/itest/lnd_multi-hop-error-propagation.go
rename to lntest/itest/lnd_multi-hop-error-propagation_test.go
diff --git a/lntest/itest/lnd_multi-hop-payments.go b/lntest/itest/lnd_multi-hop-payments_test.go
similarity index 100%
rename from lntest/itest/lnd_multi-hop-payments.go
rename to lntest/itest/lnd_multi-hop-payments_test.go
diff --git a/lntest/itest/onchain.go b/lntest/itest/lnd_onchain_test.go
similarity index 100%
rename from lntest/itest/onchain.go
rename to lntest/itest/lnd_onchain_test.go
diff --git a/lntest/itest/psbt.go b/lntest/itest/lnd_psbt_test.go
similarity index 100%
rename from lntest/itest/psbt.go
rename to lntest/itest/lnd_psbt_test.go
diff --git a/lntest/itest/rest_api.go b/lntest/itest/lnd_rest_api_test.go
similarity index 100%
rename from lntest/itest/rest_api.go
rename to lntest/itest/lnd_rest_api_test.go
diff --git a/lntest/itest/lnd_send_multi_path_payment.go b/lntest/itest/lnd_send_multi_path_payment_test.go
similarity index 100%
rename from lntest/itest/lnd_send_multi_path_payment.go
rename to lntest/itest/lnd_send_multi_path_payment_test.go