diff --git a/datadog_checks_base/datadog_checks/base/utils/http.py b/datadog_checks_base/datadog_checks/base/utils/http.py
index a883b2e058502..ef8205d22fd5a 100644
--- a/datadog_checks_base/datadog_checks/base/utils/http.py
+++ b/datadog_checks_base/datadog_checks/base/utils/http.py
@@ -96,7 +96,7 @@ def __init__(self, instance, init_config, remapper=None):
             config[field] = value
 
         # http://docs.python-requests.org/en/master/user/advanced/#timeouts
-        timeout = int(config['timeout'])
+        timeout = float(config['timeout'])
 
         # http://docs.python-requests.org/en/master/user/quickstart/#custom-headers
         # http://docs.python-requests.org/en/master/user/advanced/#header-ordering
diff --git a/datadog_checks_base/tests/test_http.py b/datadog_checks_base/tests/test_http.py
index be3f332eb6b70..6025b229d3e9d 100644
--- a/datadog_checks_base/tests/test_http.py
+++ b/datadog_checks_base/tests/test_http.py
@@ -17,33 +17,18 @@
 pytestmark = pytest.mark.http
 
 
-def test_default_timeout():
-    # Assert the timeout is slightly larger than a multiple of 3,
-    # which is the default TCP packet retransmission window. See:
-    # https://tools.ietf.org/html/rfc2988
-    assert 0 < STANDARD_FIELDS['timeout'] % 3 <= 1
-
-
 class TestAttribute:
     def test_default(self):
         check = AgentCheck('test', {}, [{}])
 
         assert check._http is None
 
-    def test_flag(self):
+    def test_activate(self):
         check = AgentCheck('test', {}, [{}])
 
         assert check.http == check._http
         assert isinstance(check.http, RequestsWrapper)
 
-    def test_remapper_no_trigger(self):
-        class TestCheck(AgentCheck):
-            HTTP_CONFIG_REMAPPER = {'foo': {}}
-
-        check = TestCheck('test', {}, [{}])
-
-        assert check._http is None
-
 
 class TestTimeout:
     def test_config_default(self):
@@ -51,14 +36,17 @@ def test_config_default(self):
         init_config = {}
         http = RequestsWrapper(instance, init_config)
 
-        assert http.options['timeout'] == STANDARD_FIELDS['timeout']
+        # Assert the timeout is slightly larger than a multiple of 3,
+        # which is the default TCP packet retransmission window. See:
+        # https://tools.ietf.org/html/rfc2988
+        assert 0 < http.options['timeout'] % 3 <= 1
 
     def test_config_timeout(self):
-        instance = {'timeout': 25}
+        instance = {'timeout': 24.5}
         init_config = {}
         http = RequestsWrapper(instance, init_config)
 
-        assert http.options['timeout'] == 25
+        assert http.options['timeout'] == 24.5
 
 
 class TestHeaders: