diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb7e042ec..72ad6a148 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to AET will be documented in this file.
 **List of changes that are finished but not yet released in any final version.**
 
 - [PR-271](https://github.com/Cognifide/aet/pull/271) Added possibility to override name parameter from the aet client
+- [PR-268](https://github.com/Cognifide/aet/pull/268) Bobcat upgrade to version 1.4.0
 
 ## Version 2.1.6
 
diff --git a/integration-tests/README.md b/integration-tests/README.md
index e2afc4186..db1c98a1e 100644
--- a/integration-tests/README.md
+++ b/integration-tests/README.md
@@ -40,7 +40,14 @@ Bobcat tests for AET reports web application.
 Prerequisities:
 
 * AET instance running
-* sample test suite: `test-suite` executed against `sample-site` site.
-Report should be available at `report.url`
-(please configured it in `src/main/config/instance.properties` file).
+* Sample test suite: `test-suite` already executed against `sample-site` site.
+Functional tests expect the report at URL specified by `report.url` property.
+By default the URL is [http://aet-vagrant/report.html?company=aet&project=aet&suite=main](http://aet-vagrant/report.html?company=aet&project=aet&suite=main)
+It may be changed it in `.../config/dev/instance.properties` file.
+* Chrome browser installed
+* Selenium [Chromedriver] available at *D:/Selenium/chromedriver.exe*.
+This path can be changed at command-line with `-Dwebdriver.chrome.driver=<path>`
+or in `.../config/common/webdriver.properties` file.
 
+
+[Chromedriver]: https://sites.google.com/a/chromium.org/chromedriver/
diff --git a/integration-tests/sanity-functional/pom.xml b/integration-tests/sanity-functional/pom.xml
index 6229af328..579f01f5d 100644
--- a/integration-tests/sanity-functional/pom.xml
+++ b/integration-tests/sanity-functional/pom.xml
@@ -33,26 +33,14 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <runSuite>**/CucumberSuite.java</runSuite>
-    <configuration.paths>src/main/config</configuration.paths>
+    <runSuite>**/CucumberSuite.java,**/BobcatSuite.java</runSuite>
+    <bobcat.version>1.4.0</bobcat.version>
 
-    <bobcat.version>1.2.1</bobcat.version>
-    <!-- there were some errors while trying to use version 1.2.4, do NOT upgrade -->
-    <cucumber.version>1.2.3</cucumber.version>
-
-    <!-- we are using newer version here as Bobcat needs JAVA 1.8 -->
     <source.java.version>1.8</source.java.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
-      <!-- junit scope needs to be overwritten for steps definition -->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.11</version>
-        <scope>compile</scope>
-      </dependency>
       <!-- functional-tests (bobcat and cucumber need compile scope) -->
       <dependency>
         <groupId>com.cognifide.qa.bb</groupId>
@@ -70,19 +58,9 @@
         <version>${bobcat.version}</version>
       </dependency>
       <dependency>
-        <groupId>info.cukes</groupId>
-        <artifactId>cucumber-java</artifactId>
-        <version>${cucumber.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>info.cukes</groupId>
-        <artifactId>cucumber-junit</artifactId>
-        <version>${cucumber.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>info.cukes</groupId>
-        <artifactId>cucumber-guice</artifactId>
-        <version>${cucumber.version}</version>
+        <groupId>com.cognifide.qa.bb</groupId>
+        <artifactId>bb-cumber</artifactId>
+        <version>${bobcat.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -100,19 +78,9 @@
       <groupId>com.cognifide.qa.bb</groupId>
       <artifactId>bb-reports</artifactId>
     </dependency>
-
-    <!-- cucumber -->
-    <dependency>
-      <groupId>info.cukes</groupId>
-      <artifactId>cucumber-java</artifactId>
-    </dependency>
     <dependency>
-      <groupId>info.cukes</groupId>
-      <artifactId>cucumber-junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>info.cukes</groupId>
-      <artifactId>cucumber-guice</artifactId>
+      <groupId>com.cognifide.qa.bb</groupId>
+      <artifactId>bb-cumber</artifactId>
     </dependency>
   </dependencies>
 
@@ -240,9 +208,6 @@
           <execution>
             <id>default-test</id>
             <configuration>
-              <systemPropertyVariables>
-                <configuration.paths>${configuration.paths}</configuration.paths>
-              </systemPropertyVariables>
               <includes>
                 <include>${runSuite}</include>
               </includes>
diff --git a/integration-tests/sanity-functional/src/main/java/com/cognifide/aet/sanity/functional/GuiceModule.java b/integration-tests/sanity-functional/src/main/java/com/cognifide/aet/sanity/functional/GuiceModule.java
index 498139bfe..cc970280c 100644
--- a/integration-tests/sanity-functional/src/main/java/com/cognifide/aet/sanity/functional/GuiceModule.java
+++ b/integration-tests/sanity-functional/src/main/java/com/cognifide/aet/sanity/functional/GuiceModule.java
@@ -23,6 +23,9 @@ public class GuiceModule extends AbstractModule {
 
   @Override
   protected void configure() {
+    if (System.getProperty("configuration.paths") == null) {
+      System.setProperty("configuration.paths", "src/main/resources/config/dev;src/main/resources/config/common");
+    }
     install(new CoreModule());
     install(new ReporterModule());
   }
diff --git a/integration-tests/sanity-functional/src/main/config/webdriver.properties b/integration-tests/sanity-functional/src/main/resources/config/common/proxy.properties
similarity index 65%
rename from integration-tests/sanity-functional/src/main/config/webdriver.properties
rename to integration-tests/sanity-functional/src/main/resources/config/common/proxy.properties
index e65dcdc91..bd7f7a9e1 100644
--- a/integration-tests/sanity-functional/src/main/config/webdriver.properties
+++ b/integration-tests/sanity-functional/src/main/resources/config/common/proxy.properties
@@ -15,13 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-webdriver.defaultTimeout=10
 
-# +++ Chrome +++
-#webdriver.chrome.driver property should point to Chrome webdriver executable.
-webdriver.type=chrome
-webdriver.chrome.driver=D:/Selenium/chromedriver.exe
-
-# +++ Firefox +++
-#webdriver.type=firefox
-#webdriver.firefox.bin=C:/Program Files (x86)/Mozilla Firefox 36/firefox.exe
\ No newline at end of file
+proxy.enabled=false
+proxy.ip=127.0.0.1
+proxy.port=9000
diff --git a/integration-tests/sanity-functional/src/main/config/report.properties b/integration-tests/sanity-functional/src/main/resources/config/common/report.properties
similarity index 89%
rename from integration-tests/sanity-functional/src/main/config/report.properties
rename to integration-tests/sanity-functional/src/main/resources/config/common/report.properties
index 3a715975f..7a02b8bcb 100644
--- a/integration-tests/sanity-functional/src/main/config/report.properties
+++ b/integration-tests/sanity-functional/src/main/resources/config/common/report.properties
@@ -17,7 +17,7 @@
 #
 
 # where to put reports and screenshots
-bobcat.report.path=./target/bobcat-report-html
+bobcat.report.path=./target/report
 
 # possible values: html, json, simple, stdout
-bobcat.report.reporters=html
+bobcat.report.reporters=html,json,simple,stdout
diff --git a/integration-tests/sanity-functional/src/main/resources/config/common/webdriver.properties b/integration-tests/sanity-functional/src/main/resources/config/common/webdriver.properties
new file mode 100644
index 000000000..507a876ff
--- /dev/null
+++ b/integration-tests/sanity-functional/src/main/resources/config/common/webdriver.properties
@@ -0,0 +1,48 @@
+#
+# AET
+#
+# Copyright (C) 2013 Cognifide Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+webdriver.defaultTimeout=10
+page.title.timeout=30
+thread.count=3
+
+
+# +++ Chrome +++
+#webdriver.chrome.driver property should point to Chrome webdriver executable.
+webdriver.type=chrome
+webdriver.chrome.driver=D:/Selenium/chromedriver.exe
+
+# +++ Firefox +++
+#webdriver.type=firefox
+#webdriver.firefox.bin=C:/Program Files (x86)/Mozilla Firefox 36/firefox.exe
+
+# +++ Firefox +++
+#webdriver.type=firefox
+#webdriver.gecko.driver=D:/Selenium/geckodriver.exe
+# If you have special version for test you can uncomment and change next line
+#webdriver.firefox.bin=c:/Program Files (x86)/Mozilla_Firefox_26/firefox.exe
+
+# +++ IE +++
+#webdriver.type=IE
+#webdriver.ie.driver=E:/IEDriverServer.exe
+
+# +++ Ghost/Phantomjs +++
+#webdriver.type=ghost
+#phantomjs.binary.path=E:/phantomjs-1.9.7-windows/phantomjs.exe
+
+# +++ HtmlUnit +++
+#webdriver.type=html
diff --git a/integration-tests/sanity-functional/src/main/config/instances.properties b/integration-tests/sanity-functional/src/main/resources/config/dev/instances.properties
similarity index 100%
rename from integration-tests/sanity-functional/src/main/config/instances.properties
rename to integration-tests/sanity-functional/src/main/resources/config/dev/instances.properties
diff --git a/integration-tests/sanity-functional/src/test/java/com/cognifide/aet/sanity/functional/suites/BobcatSuite.java b/integration-tests/sanity-functional/src/test/java/com/cognifide/aet/sanity/functional/suites/BobcatSuite.java
index ca8d16d0b..5f93aeeaf 100644
--- a/integration-tests/sanity-functional/src/test/java/com/cognifide/aet/sanity/functional/suites/BobcatSuite.java
+++ b/integration-tests/sanity-functional/src/test/java/com/cognifide/aet/sanity/functional/suites/BobcatSuite.java
@@ -15,11 +15,15 @@
  */
 package com.cognifide.aet.sanity.functional.suites;
 
+import com.cognifide.aet.sanity.functional.GuiceModule;
 import com.cognifide.aet.sanity.functional.HomePageTilesTest;
+import com.cognifide.qa.bb.junit.Modules;
+import com.cognifide.qa.bb.junit.concurrent.ConcurrentSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
+@Modules(GuiceModule.class)
+@RunWith(ConcurrentSuite.class)
 @Suite.SuiteClasses({HomePageTilesTest.class})
 public class BobcatSuite {