diff --git a/libs/remix-debug/test/debugger.js b/libs/remix-debug/test/debugger.js
index cd9e723279..aba3a821db 100644
--- a/libs/remix-debug/test/debugger.js
+++ b/libs/remix-debug/test/debugger.js
@@ -8,7 +8,7 @@ var vmCall = require('./vmCall')
 var Debugger = require('../src/Ethdebugger')
 var compiler = require('solc')
 
-var ballot = `pragma solidity >=0.4.22 <0.8.0;
+var ballot = `pragma solidity >=0.4.22 <0.7.0;
 
 /** 
  * @title Ballot
@@ -40,7 +40,7 @@ contract Ballot {
      * @dev Create a new ballot to choose one of 'proposalNames'.
      * @param proposalNames names of proposals
      */
-    constructor(bytes32[] memory proposalNames) {
+    constructor(bytes32[] memory proposalNames) public {
         uint p = 45;
         chairperson = msg.sender;
         address addressLocal = msg.sender; // copy of state variable
diff --git a/libs/remix-lib/test/txFormat.js b/libs/remix-lib/test/txFormat.js
index fc07cd604d..9d897d53f4 100644
--- a/libs/remix-lib/test/txFormat.js
+++ b/libs/remix-lib/test/txFormat.js
@@ -376,7 +376,7 @@ const nestedArrayContract = `contract nestedArrayContractTest {
   }
 }`
 
-const deploySimpleLib = `pragma solidity >= 0.5.0 < 0.8.0;
+const deploySimpleLib = `pragma solidity >= 0.5.0 < 0.7.0;
 
 library lib1 {
     function getEmpty () public {
@@ -397,14 +397,14 @@ contract testContractLinkLibrary {
  }
  }`
 
-const encodeFunctionCall = `pragma solidity >= 0.5.0 < 0.8.0;
+const encodeFunctionCall = `pragma solidity >= 0.5.0 < 0.7.0;
 
 contract testContractLinkLibrary {
     function get (uint _p, string memory _o) public {
     }
  }`
 
-const fallbackAndReceiveFunction = `pragma solidity >= 0.5.0 < 0.8.0;
+const fallbackAndReceiveFunction = `pragma solidity >= 0.5.0 < 0.7.0;
 
 contract fallbackAndReceiveFunctionContract {
     function get (uint _p, string memory _o) public {
diff --git a/libs/remix-tests/tests/examples_1/simple_storage.sol b/libs/remix-tests/tests/examples_1/simple_storage.sol
index 962f48db0d..402c9b8955 100644
--- a/libs/remix-tests/tests/examples_1/simple_storage.sol
+++ b/libs/remix-tests/tests/examples_1/simple_storage.sol
@@ -1,8 +1,8 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 contract SimpleStorage {
   uint public storedData;
 
-  constructor() {
+  constructor() public {
     storedData = 100;
   }
 
diff --git a/libs/remix-tests/tests/examples_1/simple_storage_test.sol b/libs/remix-tests/tests/examples_1/simple_storage_test.sol
index 958788563a..6e6518c7be 100644
--- a/libs/remix-tests/tests/examples_1/simple_storage_test.sol
+++ b/libs/remix-tests/tests/examples_1/simple_storage_test.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 import "./simple_storage.sol";
 
 contract MyTest {
diff --git a/libs/remix-tests/tests/examples_2/simple_storage.sol b/libs/remix-tests/tests/examples_2/simple_storage.sol
index 7ee2ffdc6d..7ce910b014 100644
--- a/libs/remix-tests/tests/examples_2/simple_storage.sol
+++ b/libs/remix-tests/tests/examples_2/simple_storage.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 contract SimpleStorage {
   uint public storedData;
 
diff --git a/libs/remix-tests/tests/examples_2/simple_storage_test.sol b/libs/remix-tests/tests/examples_2/simple_storage_test.sol
index a0c3a0d6ca..68efe17ac3 100644
--- a/libs/remix-tests/tests/examples_2/simple_storage_test.sol
+++ b/libs/remix-tests/tests/examples_2/simple_storage_test.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 import "./simple_storage.sol";
 
 contract MyTest {
diff --git a/libs/remix-tests/tests/examples_3/simple_string.sol b/libs/remix-tests/tests/examples_3/simple_string.sol
index 1bc847f984..6daed1d02a 100644
--- a/libs/remix-tests/tests/examples_3/simple_string.sol
+++ b/libs/remix-tests/tests/examples_3/simple_string.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 contract SimpleString {
   string public storedData;
 
diff --git a/libs/remix-tests/tests/examples_3/simple_string_test.sol b/libs/remix-tests/tests/examples_3/simple_string_test.sol
index 3157f53c35..a96582b735 100644
--- a/libs/remix-tests/tests/examples_3/simple_string_test.sol
+++ b/libs/remix-tests/tests/examples_3/simple_string_test.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 import "./simple_string.sol";
 
 contract StringTest {
diff --git a/libs/remix-tests/tests/examples_4/SafeMath.sol b/libs/remix-tests/tests/examples_4/SafeMath.sol
index a93aedaf44..8d262fb1f8 100644
--- a/libs/remix-tests/tests/examples_4/SafeMath.sol
+++ b/libs/remix-tests/tests/examples_4/SafeMath.sol
@@ -1,6 +1,6 @@
 // Copyright (c) 2016 Smart Contract Solutions, Inc.
 
-pragma solidity >=0.4.22 <0.8.0;
+pragma solidity >=0.4.22 <0.7.0;
 
 
 /**
diff --git a/libs/remix-tests/tests/examples_4/SafeMathProxy.sol b/libs/remix-tests/tests/examples_4/SafeMathProxy.sol
index 805c6d9112..502f5c2ccf 100644
--- a/libs/remix-tests/tests/examples_4/SafeMathProxy.sol
+++ b/libs/remix-tests/tests/examples_4/SafeMathProxy.sol
@@ -1,4 +1,4 @@
-pragma solidity >=0.4.22 <0.8.0;
+pragma solidity >=0.4.22 <0.7.0;
 import "./SafeMath.sol";
 
 /*
diff --git a/libs/remix-tests/tests/examples_4/SafeMath_test.sol b/libs/remix-tests/tests/examples_4/SafeMath_test.sol
index aa5112dc64..72be6b2f17 100644
--- a/libs/remix-tests/tests/examples_4/SafeMath_test.sol
+++ b/libs/remix-tests/tests/examples_4/SafeMath_test.sol
@@ -1,4 +1,4 @@
-pragma solidity >=0.4.22 <0.8.0;
+pragma solidity >=0.4.22 <0.7.0;
 import "remix_tests.sol";
 import "./SafeMath.sol";
 import "./SafeMathProxy.sol";
diff --git a/libs/remix-tests/tests/examples_5/contract/simple_storage.sol b/libs/remix-tests/tests/examples_5/contract/simple_storage.sol
index ebc18f96cc..ec8d01ad2c 100644
--- a/libs/remix-tests/tests/examples_5/contract/simple_storage.sol
+++ b/libs/remix-tests/tests/examples_5/contract/simple_storage.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 
 import "../../examples_4/SafeMath.sol";
 import "../lib/EvenOdd.sol";
@@ -7,7 +7,7 @@ contract SimpleStorage is EvenOdd{
   using SafeMath for uint256;
   uint public storedData;
 
-  constructor() {
+  constructor() public {
     storedData = 100;
   }
 
diff --git a/libs/remix-tests/tests/examples_5/lib/EvenOdd.sol b/libs/remix-tests/tests/examples_5/lib/EvenOdd.sol
index a1536375a6..eca275a7a7 100644
--- a/libs/remix-tests/tests/examples_5/lib/EvenOdd.sol
+++ b/libs/remix-tests/tests/examples_5/lib/EvenOdd.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 
 contract EvenOdd {
     
diff --git a/libs/remix-tests/tests/examples_5/test/simple_storage_test.sol b/libs/remix-tests/tests/examples_5/test/simple_storage_test.sol
index c5ef812a61..4f472cf28a 100644
--- a/libs/remix-tests/tests/examples_5/test/simple_storage_test.sol
+++ b/libs/remix-tests/tests/examples_5/test/simple_storage_test.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 import "./../contract/simple_storage.sol";
 
 contract StorageResolveTest {
diff --git a/libs/remix-tests/tests/number/number_test.sol b/libs/remix-tests/tests/number/number_test.sol
index 3bbfbc14f0..9e62d01b9a 100644
--- a/libs/remix-tests/tests/number/number_test.sol
+++ b/libs/remix-tests/tests/number/number_test.sol
@@ -1,4 +1,4 @@
-pragma solidity >= 0.5.0 < 0.8.0;
+pragma solidity >= 0.5.0 < 0.7.0;
 
 contract IntegerTest {