diff --git a/ico/tests/fixtures/flatprice.py b/ico/tests/fixtures/flatprice.py
index cd699344..219522d0 100644
--- a/ico/tests/fixtures/flatprice.py
+++ b/ico/tests/fixtures/flatprice.py
@@ -76,7 +76,6 @@ def uncapped_flatprice(chain, team_multisig, preico_starts_at, preico_ends_at, f
 
     tx = {
         "from": team_multisig,
-        "gas": 6000000,
     }
 
     contract, hash = chain.provider.deploy_contract('UncappedCrowdsale', deploy_args=args, deploy_transaction=tx)
diff --git a/ico/tests/fixtures/presale.py b/ico/tests/fixtures/presale.py
index 67420750..3eef721a 100644
--- a/ico/tests/fixtures/presale.py
+++ b/ico/tests/fixtures/presale.py
@@ -52,7 +52,6 @@ def presale_fund_collector(chain, presale_freeze_ends_at, team_multisig) -> Cont
     ]
     tx = {
         "from": team_multisig,
-        "gas": 4000000
     }
     presale_fund_collector, hash = chain.provider.deploy_contract('PresaleFundCollector', deploy_args=args, deploy_transaction=tx)
     return presale_fund_collector
diff --git a/project.json b/project.json
index df02e0d6..62282a31 100644
--- a/project.json
+++ b/project.json
@@ -269,18 +269,30 @@
       "SolcAutoBackend": {
         "class": "populus.compilation.backends.SolcAutoBackend",
         "settings": {
-          "optimize": true,
-          "output_values": [
-            "abi",
-            "bin",
-            "bin-runtime",
-            "metadata"
-          ],
           "command_line_options": {
             "allow_paths": "/"
           },
           "stdin": {
-            "evmVersion": "homestead"
+            "output_values": [
+              "abi",
+              "bin",
+              "bin-runtime",
+              "metadata"
+            ],
+            "evmVersion": "homestead",
+            "optimizer": {
+              "enabled": true,
+              "runs": 500
+            },
+            "outputSelection": {
+              "*": {
+                "*": [
+                  "abi",
+                  "metadata",
+                  "evm"
+                 ]
+              }
+            }
           }
         }
       },
diff --git a/tox.ini b/tox.ini
index 35d67764..9cddbd7e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,6 @@ commands=flake8 ico
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/ico
-    TESTRPC_GAS_LIMIT = 6000000
 deps =
     -r{toxinidir}/requirements.txt
 commands =