diff --git a/.fossa.yml b/.fossa.yml
new file mode 100755
index 0000000..b746ea8
--- /dev/null
+++ b/.fossa.yml
@@ -0,0 +1,13 @@
+version: 2
+cli:
+  server: https://app.fossa.com
+  fetcher: git
+  project: github.com:elyby/chrly
+analyze:
+  modules:
+    - name: chrly
+      type: go
+      target: github.com/elyby/chrly
+      path: .
+      options:
+        strategy: dep
diff --git a/.travis.yml b/.travis.yml
index 440330e..ea474d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,13 +30,14 @@ jobs:
 
     - name: FOSSA
       stage: Tests
+      if: branch = master
       before_script:
         - curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
       script:
         - fossa init
-        - fossa analyze -p https://github.com/fossas/fossa-cli
-      after_success:
-        - fossa test -p https://github.com/fossas/fossa-cli
+        - fossa analyze
+        # Disable until https://github.com/fossas/fossa-cli/issues/596 will be resolved
+        # - fossa test
 
     # Deploy stage
     - name: Docker image