diff --git a/tox.ini b/tox.ini
index d337deb..801adae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,17 +6,12 @@ skipsdist = True
 whitelist_externals = bash
 
 [testenv:bashate]
-deps = bashate
-# NOTE: We ignore E006 violations (--ignore E006) only temporary.
-# The reason is that the currently available bashate versions (<=0.4.0) are
-# considering heredocs as normal code lines, hence lines longer than 79 columns
-# in these sections are also considered as E006 violations.
-# Commit 649c7dc79948 in bashate repository modifies bashate to ignore long
-# lines in heredocs, but currently there is no bashate release which contains
-# this commit.
-# TODO: After a new bashate released, '--ignore E006' should be deleted and the
-# newer bashate version should be specified as a dependency.
-commands = bash -c "bashate --ignore E006 --verbose {toxinidir}/ocf/*"
+# NOTE: We have a lots of long heredocs lines in the OCF scripts and older
+# bashate versions consider these as E006 violations.
+# From version 0.5.0, bashate doesn't check heredocs, so we specify this
+# version as a dependency.
+deps = bashate>=0.5.0
+commands = bash -c "bashate --verbose {toxinidir}/ocf/*"
 
 [testenv:syntax-check]
 setenv =