diff --git a/tests/e2e/asset/cli_test.go b/tests/e2e/asset/cli_test.go
index ba92ab3..dfc040a 100644
--- a/tests/e2e/asset/cli_test.go
+++ b/tests/e2e/asset/cli_test.go
@@ -2,6 +2,7 @@ package asset
 
 import (
 	"testing"
+	"time"
 
 	"github.com/planetmint/planetmint-go/testutil/network"
 
@@ -9,7 +10,7 @@ import (
 )
 
 func TestE2EAssetTestSuite(t *testing.T) {
-	t.Parallel()
+	time.Sleep(2 * time.Second)
 	cfg := network.LoaderDefaultConfig()
 	cfg.NumValidators = 3
 	suite.Run(t, NewE2ETestSuite(cfg))
diff --git a/tests/e2e/dao/basic/cli_test.go b/tests/e2e/dao/basic/cli_test.go
new file mode 100644
index 0000000..1e2804e
--- /dev/null
+++ b/tests/e2e/dao/basic/cli_test.go
@@ -0,0 +1,17 @@
+package basic
+
+import (
+	"testing"
+	"time"
+
+	"github.com/planetmint/planetmint-go/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestE2EDaoTestSuite(t *testing.T) {
+	time.Sleep(2 * time.Second)
+	cfg := network.LoaderDefaultConfig()
+	cfg.NumValidators = 3
+	suite.Run(t, NewE2ETestSuite(cfg))
+}
diff --git a/tests/e2e/dao/suite.go b/tests/e2e/dao/basic/suite.go
similarity index 99%
rename from tests/e2e/dao/suite.go
rename to tests/e2e/dao/basic/suite.go
index b141f82..2cd83e2 100644
--- a/tests/e2e/dao/suite.go
+++ b/tests/e2e/dao/basic/suite.go
@@ -1,4 +1,4 @@
-package dao
+package basic
 
 import (
 	"bufio"
diff --git a/tests/e2e/dao/cli_test.go b/tests/e2e/dao/cli_test.go
deleted file mode 100644
index 5550b08..0000000
--- a/tests/e2e/dao/cli_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package dao
-
-import (
-	"testing"
-
-	"github.com/planetmint/planetmint-go/testutil/network"
-
-	"github.com/stretchr/testify/suite"
-)
-
-func TestE2EDaoTestSuite(t *testing.T) {
-	cfg := network.LoaderDefaultConfig()
-	cfg.NumValidators = 3
-	suite.Run(t, NewE2ETestSuite(cfg))
-}
-
-func TestPopE2EDaoTestSuite(t *testing.T) {
-	cfg := network.LoaderDefaultConfig()
-	cfg.NumValidators = 3
-	suite.Run(t, NewPopSelectionE2ETestSuite(cfg))
-}
-
-func TestGasConsumptionE2EDaoTestSuite(t *testing.T) {
-	cfg := network.LoaderDefaultConfig()
-	cfg.NumValidators = 3
-	suite.Run(t, NewGasConsumptionE2ETestSuite(cfg))
-}
-
-func TestRestrictedMsgsE2EDaoTestSuite(t *testing.T) {
-	cfg := network.LoaderDefaultConfig()
-	cfg.NumValidators = 3
-	suite.Run(t, NewRestrictedMsgsE2ESuite(cfg))
-}
-
-func TestAssetDistributionE2EDaoTestSuite(t *testing.T) {
-	cfg := network.LoaderDefaultConfig()
-	cfg.NumValidators = 3
-	suite.Run(t, NewAssetDistributionE2ETestSuite(cfg))
-}
diff --git a/tests/e2e/dao/asset_distribution_suite.go b/tests/e2e/dao/distribution/asset_distribution_suite.go
similarity index 99%
rename from tests/e2e/dao/asset_distribution_suite.go
rename to tests/e2e/dao/distribution/asset_distribution_suite.go
index f342ec0..89dedbb 100644
--- a/tests/e2e/dao/asset_distribution_suite.go
+++ b/tests/e2e/dao/distribution/asset_distribution_suite.go
@@ -1,4 +1,4 @@
-package dao
+package distribution
 
 import (
 	"math"
diff --git a/tests/e2e/dao/distribution/cli_test.go b/tests/e2e/dao/distribution/cli_test.go
new file mode 100644
index 0000000..ee8c0a6
--- /dev/null
+++ b/tests/e2e/dao/distribution/cli_test.go
@@ -0,0 +1,17 @@
+package distribution
+
+import (
+	"testing"
+	"time"
+
+	"github.com/planetmint/planetmint-go/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestAssetDistributionE2EDaoTestSuite(t *testing.T) {
+	time.Sleep(2 * time.Second)
+	cfg := network.LoaderDefaultConfig()
+	cfg.NumValidators = 3
+	suite.Run(t, NewAssetDistributionE2ETestSuite(cfg))
+}
diff --git a/tests/e2e/dao/gasConsumption/cli_test.go b/tests/e2e/dao/gasConsumption/cli_test.go
new file mode 100644
index 0000000..f4eae10
--- /dev/null
+++ b/tests/e2e/dao/gasConsumption/cli_test.go
@@ -0,0 +1,17 @@
+package gasConsumption
+
+import (
+	"testing"
+	"time"
+
+	"github.com/planetmint/planetmint-go/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestGasConsumptionE2EDaoTestSuite(t *testing.T) {
+	time.Sleep(2 * time.Second)
+	cfg := network.LoaderDefaultConfig()
+	cfg.NumValidators = 3
+	suite.Run(t, NewGasConsumptionE2ETestSuite(cfg))
+}
diff --git a/tests/e2e/dao/gas_consumption_suite.go b/tests/e2e/dao/gasConsumption/gas_consumption_suite.go
similarity index 99%
rename from tests/e2e/dao/gas_consumption_suite.go
rename to tests/e2e/dao/gasConsumption/gas_consumption_suite.go
index a1bf47a..31248a0 100644
--- a/tests/e2e/dao/gas_consumption_suite.go
+++ b/tests/e2e/dao/gasConsumption/gas_consumption_suite.go
@@ -1,4 +1,4 @@
-package dao
+package gasConsumption
 
 import (
 	"bufio"
diff --git a/tests/e2e/dao/pop/cli_test.go b/tests/e2e/dao/pop/cli_test.go
new file mode 100644
index 0000000..3d52c9a
--- /dev/null
+++ b/tests/e2e/dao/pop/cli_test.go
@@ -0,0 +1,17 @@
+package pop
+
+import (
+	"testing"
+	"time"
+
+	"github.com/planetmint/planetmint-go/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestPopE2EDaoTestSuite(t *testing.T) {
+	time.Sleep(2 * time.Second)
+	cfg := network.LoaderDefaultConfig()
+	cfg.NumValidators = 3
+	suite.Run(t, NewPopSelectionE2ETestSuite(cfg))
+}
diff --git a/tests/e2e/dao/pop_participant_selection_suite.go b/tests/e2e/dao/pop/pop_participant_selection_suite.go
similarity index 99%
rename from tests/e2e/dao/pop_participant_selection_suite.go
rename to tests/e2e/dao/pop/pop_participant_selection_suite.go
index 933a607..e66e5f9 100644
--- a/tests/e2e/dao/pop_participant_selection_suite.go
+++ b/tests/e2e/dao/pop/pop_participant_selection_suite.go
@@ -1,4 +1,4 @@
-package dao
+package pop
 
 import (
 	"bufio"
diff --git a/tests/e2e/dao/restrictedMsgs/cli_test.go b/tests/e2e/dao/restrictedMsgs/cli_test.go
new file mode 100644
index 0000000..2e45a18
--- /dev/null
+++ b/tests/e2e/dao/restrictedMsgs/cli_test.go
@@ -0,0 +1,17 @@
+package restrictedMsgs
+
+import (
+	"testing"
+	"time"
+
+	"github.com/planetmint/planetmint-go/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestRestrictedMsgsE2EDaoTestSuite(t *testing.T) {
+	time.Sleep(2 * time.Second)
+	cfg := network.LoaderDefaultConfig()
+	cfg.NumValidators = 3
+	suite.Run(t, NewRestrictedMsgsE2ESuite(cfg))
+}
diff --git a/tests/e2e/dao/restricted_msgs_suite.go b/tests/e2e/dao/restrictedMsgs/restricted_msgs_suite.go
similarity index 99%
rename from tests/e2e/dao/restricted_msgs_suite.go
rename to tests/e2e/dao/restrictedMsgs/restricted_msgs_suite.go
index 35749b5..7b60190 100644
--- a/tests/e2e/dao/restricted_msgs_suite.go
+++ b/tests/e2e/dao/restrictedMsgs/restricted_msgs_suite.go
@@ -1,4 +1,4 @@
-package dao
+package restrictedMsgs
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/tests/e2e/machine/cli_test.go b/tests/e2e/machine/cli_test.go
index 312820d..a131597 100644
--- a/tests/e2e/machine/cli_test.go
+++ b/tests/e2e/machine/cli_test.go
@@ -2,6 +2,7 @@ package machine
 
 import (
 	"testing"
+	"time"
 
 	"github.com/planetmint/planetmint-go/testutil/network"
 
@@ -9,6 +10,7 @@ import (
 )
 
 func TestE2EMachineTestSuite(t *testing.T) {
+	time.Sleep(2 * time.Second)
 	cfg := network.LoaderDefaultConfig()
 	cfg.NumValidators = 3
 	suite.Run(t, NewE2ETestSuite(cfg))