diff --git a/contrib/teamcity/build-configurations.sh b/contrib/teamcity/build-configurations.sh
--- a/contrib/teamcity/build-configurations.sh
+++ b/contrib/teamcity/build-configurations.sh
@@ -94,7 +94,6 @@
       TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --extended"
     fi
     ./test/functional/test_runner.py -J=junit_results_default.xml ${TEST_RUNNER_FLAGS}
-    ./test/functional/test_runner.py -J=junit_results_next_upgrade.xml --with-gravitonactivation ${TEST_RUNNER_FLAGS}
 
     # Build secp256k1 and run the java tests.
     export TOPLEVEL="${TOPLEVEL}"/src/secp256k1
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -101,8 +101,6 @@
                             help="Attach a python debugger if test fails")
         parser.add_argument("--usecli", dest="usecli", default=False, action="store_true",
                             help="use bitcoin-cli instead of RPC for all commands")
-        parser.add_argument("--with-gravitonactivation", dest="gravitonactivation", default=False, action="store_true",
-                            help="Activate graviton update on timestamp {}".format(TIMESTAMP_IN_THE_PAST))
         self.add_options(parser)
         self.options = parser.parse_args()
 
@@ -262,9 +260,6 @@
         for i in range(num_nodes):
             self.nodes.append(TestNode(i, get_datadir_path(self.options.tmpdir, i), host=rpchost, rpc_port=rpc_port(i), p2p_port=p2p_port(i), timewait=timewait,
                                        bitcoind=binary[i], bitcoin_cli=self.options.bitcoincli, mocktime=self.mocktime, coverage_dir=self.options.coveragedir, extra_conf=extra_confs[i], extra_args=extra_args[i], use_cli=self.options.usecli))
-            if self.options.gravitonactivation:
-                self.nodes[i].extend_default_args(
-                    ["-gravitonactivationtime={}".format(TIMESTAMP_IN_THE_PAST)])
 
     def start_node(self, i, *args, **kwargs):
         """Start a bitcoind"""
@@ -410,9 +405,6 @@
                 if i > 0:
                     self.nodes[i].extend_default_args(
                         ["-connect=127.0.0.1:" + str(p2p_port(0))])
-                if self.options.gravitonactivation:
-                    self.nodes[i].extend_default_args(
-                        ["-gravitonactivationtime={}".format(TIMESTAMP_IN_THE_PAST)])
                 self.start_node(i)
 
             # Wait for RPC connections to be ready