diff --git a/tests/integration/tests/upload/Main.hs b/tests/integration/tests/0000-upload/Main.hs
similarity index 94%
rename from tests/integration/tests/upload/Main.hs
rename to tests/integration/tests/0000-upload/Main.hs
index 2a7e47dc38..1751ae2c14 100644
--- a/tests/integration/tests/upload/Main.hs
+++ b/tests/integration/tests/0000-upload/Main.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE NumericUnderscores #-}
+
 import           Control.Concurrent
 
 import           StackTest
@@ -28,7 +30,7 @@ withFakeHackage act = do
     -- Start the fake server
     withCreateProcess (proc stackEnv $ withNetworkArgs ++ ["FakeHackage.hs"]) $ \_ _ _ _ -> do
         -- Wait for the fake server to start accepting requests
-        threadDelay 3000000
+        threadDelay 10_000_000
         act
   where
     withNetworkArgs = ["runghc", "--package", "network"]
diff --git a/tests/integration/tests/upload/files/FakeHackage.hs b/tests/integration/tests/0000-upload/files/FakeHackage.hs
similarity index 100%
rename from tests/integration/tests/upload/files/FakeHackage.hs
rename to tests/integration/tests/0000-upload/files/FakeHackage.hs
diff --git a/tests/integration/tests/upload/files/FakeHackageStart.hs b/tests/integration/tests/0000-upload/files/FakeHackageStart.hs
similarity index 100%
rename from tests/integration/tests/upload/files/FakeHackageStart.hs
rename to tests/integration/tests/0000-upload/files/FakeHackageStart.hs
diff --git a/tests/integration/tests/upload/files/Foo.hs b/tests/integration/tests/0000-upload/files/Foo.hs
similarity index 100%
rename from tests/integration/tests/upload/files/Foo.hs
rename to tests/integration/tests/0000-upload/files/Foo.hs
diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg
similarity index 100%
rename from tests/integration/tests/upload/files/gpg-disabled/gpg
rename to tests/integration/tests/0000-upload/files/gpg-disabled/gpg
diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg.bat b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg.bat
similarity index 100%
rename from tests/integration/tests/upload/files/gpg-disabled/gpg.bat
rename to tests/integration/tests/0000-upload/files/gpg-disabled/gpg.bat
diff --git a/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2 b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2
new file mode 100644
index 0000000000..a7506d694e
--- /dev/null
+++ b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2
@@ -0,0 +1 @@
+gpg
\ No newline at end of file
diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg2.bat b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2.bat
similarity index 100%
rename from tests/integration/tests/upload/files/gpg-disabled/gpg2.bat
rename to tests/integration/tests/0000-upload/files/gpg-disabled/gpg2.bat
diff --git a/tests/integration/tests/upload/files/stack.yaml b/tests/integration/tests/0000-upload/files/stack.yaml
similarity index 100%
rename from tests/integration/tests/upload/files/stack.yaml
rename to tests/integration/tests/0000-upload/files/stack.yaml
diff --git a/tests/integration/tests/upload/files/uploadtest.cabal b/tests/integration/tests/0000-upload/files/uploadtest.cabal
similarity index 100%
rename from tests/integration/tests/upload/files/uploadtest.cabal
rename to tests/integration/tests/0000-upload/files/uploadtest.cabal
diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg2 b/tests/integration/tests/upload/files/gpg-disabled/gpg2
deleted file mode 120000
index a7506d694e..0000000000
--- a/tests/integration/tests/upload/files/gpg-disabled/gpg2
+++ /dev/null
@@ -1 +0,0 @@
-gpg
\ No newline at end of file