diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index f310bee50f..05a1a57bd5 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -1530,8 +1530,8 @@ Res ApplyAppointOracleTx(
         Consensus::Params const &consensusParams,
         bool skipAuth,
         UniValue *rpcInfo) {
-    if ((int) height < consensusParams.BayfrontHeight) {
-        return Res::Err("Appoint oracle tx before Bayfront height (block %d)", consensusParams.BayfrontHeight);
+    if ((int) height < consensusParams.EunosHeight) {
+        return Res::Err("Appoint oracle tx before Eunos height (block %d)", consensusParams.EunosHeight);
     }
 
     CDataStream ss(metadata, SER_NETWORK, PROTOCOL_VERSION);
@@ -1575,8 +1575,8 @@ Res ApplyUpdateOracleAppointTx(CCustomCSView &mnview,
                                Consensus::Params const &consensusParams,
                                bool skipAuth,
                                UniValue *rpcInfo) {
-    if ((int) height < consensusParams.BayfrontHeight) {
-        return Res::Err("Update oracle appoint tx before Bayfront height (block %d)", consensusParams.BayfrontHeight);
+    if ((int) height < consensusParams.EunosHeight) {
+        return Res::Err("Appoint oracle tx before Eunos height (block %d)", consensusParams.EunosHeight);
     }
 
     CDataStream ss(metadata, SER_NETWORK, PROTOCOL_VERSION);
@@ -1621,8 +1621,8 @@ Res ApplyRemoveOracleAppointTx(
         Consensus::Params const &consensusParams,
         bool skipAuth,
         UniValue *rpcInfo) {
-    if ((int) height < consensusParams.BayfrontHeight) {
-        return Res::Err("Remove oracle appoint tx before Bayfront height (block %d)", consensusParams.BayfrontHeight);
+    if ((int) height < consensusParams.EunosHeight) {
+        return Res::Err("Appoint oracle tx before Eunos height (block %d)", consensusParams.EunosHeight);
     }
 
     CDataStream ss(metadata, SER_NETWORK, PROTOCOL_VERSION);
@@ -1652,9 +1652,8 @@ Res ApplySetOracleDataTx(CCustomCSView &mnview,
                          Consensus::Params const &consensusParams,
                          bool skipAuth,
                          UniValue *rpcInfo) {
-    // do we need it in setoracledata?
-    if ((int) height < consensusParams.BayfrontHeight) {
-        return Res::Err("Set oracle data tx before Bayfront height (block %d)", consensusParams.BayfrontHeight);
+    if ((int) height < consensusParams.EunosHeight) {
+        return Res::Err("Appoint oracle tx before Eunos height (block %d)", consensusParams.EunosHeight);
     }
 
     CDataStream ss(metadata, SER_NETWORK, PROTOCOL_VERSION);
diff --git a/test/functional/feature_oracles.py b/test/functional/feature_oracles.py
old mode 100644
new mode 100755
index b0e48bf7d3..edb0b4c767
--- a/test/functional/feature_oracles.py
+++ b/test/functional/feature_oracles.py
@@ -26,10 +26,10 @@ def set_test_params(self):
         # node2: non foundation
         self.setup_clean_chain = True
         self.extra_args = [
-            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50'],
-            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50'],
-            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50'],
-            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50']]
+            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=1'],
+            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=1'],
+            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=1'],
+            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=1']]
 
     def create_tokens(self):
         collateral0 = self.nodes[0].getnewaddress("", "legacy")