diff --git a/systemtests/.gitignore b/tests/systemtests/.gitignore
similarity index 100%
rename from systemtests/.gitignore
rename to tests/systemtests/.gitignore
diff --git a/systemtests/Makefile b/tests/systemtests/Makefile
similarity index 100%
rename from systemtests/Makefile
rename to tests/systemtests/Makefile
diff --git a/systemtests/README.md b/tests/systemtests/README.md
similarity index 100%
rename from systemtests/README.md
rename to tests/systemtests/README.md
diff --git a/systemtests/cli.go b/tests/systemtests/cli.go
similarity index 100%
rename from systemtests/cli.go
rename to tests/systemtests/cli.go
diff --git a/systemtests/genesis_io.go b/tests/systemtests/genesis_io.go
similarity index 100%
rename from systemtests/genesis_io.go
rename to tests/systemtests/genesis_io.go
diff --git a/systemtests/go.mod b/tests/systemtests/go.mod
similarity index 99%
rename from systemtests/go.mod
rename to tests/systemtests/go.mod
index 00f27b6da19a..12f73d4629b2 100644
--- a/systemtests/go.mod
+++ b/tests/systemtests/go.mod
@@ -1,4 +1,4 @@
-module cosmossdk.io/systemtests
+module cosmossdk.io/tests/systemtests
 
 go 1.22
 
diff --git a/systemtests/go.sum b/tests/systemtests/go.sum
similarity index 100%
rename from systemtests/go.sum
rename to tests/systemtests/go.sum
diff --git a/systemtests/main_test.go b/tests/systemtests/main_test.go
similarity index 100%
rename from systemtests/main_test.go
rename to tests/systemtests/main_test.go
diff --git a/systemtests/rpc_client.go b/tests/systemtests/rpc_client.go
similarity index 100%
rename from systemtests/rpc_client.go
rename to tests/systemtests/rpc_client.go
diff --git a/systemtests/staking_test.go b/tests/systemtests/staking_test.go
similarity index 100%
rename from systemtests/staking_test.go
rename to tests/systemtests/staking_test.go
diff --git a/systemtests/system.go b/tests/systemtests/system.go
similarity index 100%
rename from systemtests/system.go
rename to tests/systemtests/system.go
diff --git a/systemtests/test_runner.go b/tests/systemtests/test_runner.go
similarity index 99%
rename from systemtests/test_runner.go
rename to tests/systemtests/test_runner.go
index c327c0f14a75..e1227e9b386f 100644
--- a/systemtests/test_runner.go
+++ b/tests/systemtests/test_runner.go
@@ -96,7 +96,6 @@ func requireEnoughFileHandlers(nodesCount int) {
 	if fileDescrCount < expFH {
 		panic(fmt.Sprintf("Fail fast. Insufficient setup. Run 'ulimit -n %d'", expFH))
 	}
-	return
 }
 
 func initSDKConfig(bech32Prefix string) {
diff --git a/systemtests/testnet_init.go b/tests/systemtests/testnet_init.go
similarity index 100%
rename from systemtests/testnet_init.go
rename to tests/systemtests/testnet_init.go
diff --git a/systemtests/upgrade_test.go b/tests/systemtests/upgrade_test.go
similarity index 100%
rename from systemtests/upgrade_test.go
rename to tests/systemtests/upgrade_test.go