diff --git a/bigchaindb/tendermint/event_stream.py b/bigchaindb/tendermint/event_stream.py
index 9db8f2d9..2191924b 100644
--- a/bigchaindb/tendermint/event_stream.py
+++ b/bigchaindb/tendermint/event_stream.py
@@ -11,8 +11,8 @@ from bigchaindb.events import EventTypes, Event
 from bigchaindb.tendermint.utils import decode_transaction_base64
 
 
-HOST = getenv('TENDERMINT_HOST', 'localhost')
-PORT = int(getenv('TENDERMINT_PORT', 46657))
+HOST = getenv('BIGCHAINDB_TENDERMINT_HOST', 'localhost')
+PORT = int(getenv('BIGCHAINDB_TENDERMINT_PORT', 46657))
 URL = f'ws://{HOST}:{PORT}/websocket'
 
 logger = logging.getLogger(__name__)
diff --git a/bigchaindb/tendermint/lib.py b/bigchaindb/tendermint/lib.py
index 37788b51..d4e6647f 100644
--- a/bigchaindb/tendermint/lib.py
+++ b/bigchaindb/tendermint/lib.py
@@ -17,9 +17,12 @@ from bigchaindb import exceptions as core_exceptions
 
 logger = logging.getLogger(__name__)
 
-TENDERMINT_HOST = getenv('TENDERMINT_HOST', 'localhost')
-TENDERMINT_PORT = getenv('TENDERMINT_PORT', '46657')
-ENDPOINT = 'http://{}:{}/'.format(TENDERMINT_HOST, TENDERMINT_PORT)
+BIGCHAINDB_TENDERMINT_HOST = getenv('BIGCHAINDB_TENDERMINT_HOST',
+                                    'localhost')
+BIGCHAINDB_TENDERMINT_PORT = getenv('BIGCHAINDB_TENDERMINT_PORT',
+                                    '46657')
+ENDPOINT = 'http://{}:{}/'.format(BIGCHAINDB_TENDERMINT_HOST,
+                                  BIGCHAINDB_TENDERMINT_PORT)
 MODE_LIST = ('broadcast_tx_async',
              'broadcast_tx_sync',
              'broadcast_tx_commit')
diff --git a/compose/bigchaindb-server/Dockerfile b/compose/bigchaindb-server/Dockerfile
index 4abd8af8..56c63e22 100644
--- a/compose/bigchaindb-server/Dockerfile
+++ b/compose/bigchaindb-server/Dockerfile
@@ -22,7 +22,7 @@ ENV BIGCHAINDB_WSSERVER_ADVERTISED_HOST 0.0.0.0
 ENV BIGCHAINDB_WSSERVER_ADVERTISED_SCHEME ws
 
 ENV BIGCHAINDB_START_TENDERMINT 0
-ENV TENDERMINT_PORT 46657
+ENV BIGCHAINDB_TENDERMINT_PORT 46657
 
 
 RUN mkdir -p /usr/src/app
diff --git a/compose/travis/Dockerfile b/compose/travis/Dockerfile
index 1717f9c6..7a634684 100644
--- a/compose/travis/Dockerfile
+++ b/compose/travis/Dockerfile
@@ -20,7 +20,7 @@ ENV BIGCHAINDB_WSSERVER_ADVERTISED_HOST 0.0.0.0
 ENV BIGCHAINDB_WSSERVER_ADVERTISED_SCHEME ws
 
 ENV BIGCHAINDB_START_TENDERMINT 0
-ENV TENDERMINT_PORT 46657
+ENV BIGCHAINDB_TENDERMINT_PORT 46657
 
 RUN mkdir -p /usr/src/app
 COPY . /usr/src/app/
diff --git a/docker-compose.network.yml b/docker-compose.network.yml
index 38a4b5c4..eb2cdfa6 100644
--- a/docker-compose.network.yml
+++ b/docker-compose.network.yml
@@ -27,7 +27,7 @@ services:
     environment:
       BIGCHAINDB_DATABASE_BACKEND: localmongodb
       BIGCHAINDB_DATABASE_HOST: mdb-one
-      TENDERMINT_HOST: tendermint-one
+      BIGCHAINDB_TENDERMINT_HOST: tendermint-one
     ports:
       - "9984"
     command: bigchaindb -l DEBUG start
@@ -64,7 +64,7 @@ services:
     environment:
       BIGCHAINDB_DATABASE_BACKEND: localmongodb
       BIGCHAINDB_DATABASE_HOST: mdb-two
-      TENDERMINT_HOST: tendermint-two
+      BIGCHAINDB_TENDERMINT_HOST: tendermint-two
     ports:
       - "9984"
     command: bigchaindb -l DEBUG start
@@ -101,7 +101,7 @@ services:
     environment:
       BIGCHAINDB_DATABASE_BACKEND: localmongodb
       BIGCHAINDB_DATABASE_HOST: mdb-three
-      TENDERMINT_HOST: tendermint-three
+      BIGCHAINDB_TENDERMINT_HOST: tendermint-three
     ports:
       - "9984"
     command: bigchaindb -l DEBUG start
@@ -138,7 +138,7 @@ services:
     environment:
       BIGCHAINDB_DATABASE_BACKEND: localmongodb
       BIGCHAINDB_DATABASE_HOST: mdb-four
-      TENDERMINT_HOST: tendermint-four
+      BIGCHAINDB_TENDERMINT_HOST: tendermint-four
     ports:
       - "9984"
     command: bigchaindb -l DEBUG start
diff --git a/docker-compose.tendermint.yml b/docker-compose.tendermint.yml
index 1354de55..d43af4d9 100644
--- a/docker-compose.tendermint.yml
+++ b/docker-compose.tendermint.yml
@@ -30,8 +30,8 @@ services:
       BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984
       BIGCHAINDB_WSSERVER_HOST: 0.0.0.0
       BIGCHAINDB_START_TENDERMINT: 0
-      TENDERMINT_HOST: tendermint
-      TENDERMINT_PORT: 46657
+      BIGCHAINDB_TENDERMINT_HOST: tendermint
+      BIGCHAINDB_TENDERMINT_PORT: 46657
     ports:
       - "9984"
       - "46658"
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index 7a6db3ea..e8d1c583 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -22,8 +22,8 @@ services:
       BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984
       BIGCHAINDB_WSSERVER_HOST: 0.0.0.0
       BIGCHAINDB_START_TENDERMINT: 0
-      TENDERMINT_HOST: tendermint
-      TENDERMINT_PORT: 46657
+      BIGCHAINDB_TENDERMINT_HOST: tendermint
+      BIGCHAINDB_TENDERMINT_PORT: 46657
     command: bigchaindb start
   tendermint:
     image: tendermint/tendermint:0.13
diff --git a/tests/conftest.py b/tests/conftest.py
index 88507072..5d486ad8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -501,12 +501,12 @@ def db_context(db_config, db_host, db_port, db_name, db_conn):
 
 @pytest.fixture
 def tendermint_host():
-    return os.getenv('TENDERMINT_HOST', 'localhost')
+    return os.getenv('BIGCHAINDB_TENDERMINT_HOST', 'localhost')
 
 
 @pytest.fixture
 def tendermint_port():
-    return int(os.getenv('TENDERMINT_PORT', 46657))
+    return int(os.getenv('BIGCHAINDB_TENDERMINT_PORT', 46657))
 
 
 @pytest.fixture