diff --git a/src/ecdsa.js b/src/ecdsa.js
index 744557c..f46e56d 100644
--- a/src/ecdsa.js
+++ b/src/ecdsa.js
@@ -74,7 +74,7 @@ var ecdsa = {
 
   verify: function (hash, sig, pubkey) {
     var r,s
-    if (Array.isArray(sig)) {
+    if (Array.isArray(sig) || Buffer.isBuffer(sig)) {
       var obj = ecdsa.parseSig(sig)
       r = obj.r
       s = obj.s
@@ -88,7 +88,7 @@ var ecdsa = {
     var Q
     if (pubkey instanceof ECPointFp) {
       Q = pubkey
-    } else if (Array.isArray(pubkey)) {
+    } else if (Array.isArray(pubkey) || Buffer.isBuffer(pubkey)) {
       Q = ECPointFp.decodeFrom(ecparams.getCurve(), pubkey)
     } else {
       throw new Error("Invalid format for pubkey value, must be byte array or ECPointFp")
diff --git a/test/ecdsa.js b/test/ecdsa.js
index 93dfb51..ebf937a 100644
--- a/test/ecdsa.js
+++ b/test/ecdsa.js
@@ -1,5 +1,4 @@
 var assert = require('assert')
-var convert = require('..').convert
 var crypto = require('../').crypto
 var ecdsa = require('..').ecdsa
 var rng = require('secure-random')
@@ -13,7 +12,7 @@ describe('ecdsa', function() {
   describe('recoverPubKey', function() {
     it('succesfully recovers a public key', function() {
       var addr = 'mgQK8S6CfSXKjPmnujArSmVxafeJfrZsa3'
-      var signature = convert.base64ToBytes('H0PG6+PUo96UPTJ/DVj8aBU5it+Nuli4YdsLuTMvfJxoHH9Jb7jYTQXCCOX2jrTChD5S1ic3vCrUQHdmB5/sEQY=')
+      var signature = new Buffer('H0PG6+PUo96UPTJ/DVj8aBU5it+Nuli4YdsLuTMvfJxoHH9Jb7jYTQXCCOX2jrTChD5S1ic3vCrUQHdmB5/sEQY=', 'base64')
       var obj = ecdsa.parseSigCompact(signature)
       var pubKey = new ECPubKey(ecdsa.recoverPubKey(obj.r, obj.s, Message.magicHash('1111'), obj.i))
 
@@ -35,24 +34,24 @@ describe('ecdsa', function() {
       assert.ok(sig_b, 'Sign random string')
       assert.ok(s1.verify(hash, sig_b))
 
-      var message2 = convert.hexToBytes(
+      var message2 = new Buffer(
         '12dce2c169986b3346827ffb2305cf393984627f5f9722a1b1368e933c8d' +
         'd296653fbe5d7ac031c4962ad0eb1c4298c3b91d244e1116b4a76a130c13' +
         '1e7aec7fa70184a71a2e66797052831511b93c6e8d72ae58a1980eaacb66' +
         '8a33f50d7cefb96a5dab897b5efcb99cbafb0d777cb83fc9b2115b69c0fa' +
-        '3d82507b932b84e4')
+        '3d82507b932b84e4', 'hex')
 
       var hash2 = crypto.sha256(message2)
 
-      var sig_c = convert.hexToBytes(
+      var sig_c = new Buffer(
         '3044022038d9b8dd5c9fbf330565c1f51d72a59ba869aeb2c2001be959d3' +
         '79e861ec71960220a73945f32cf90d03127d2c3410d16cee120fa1a4b4c3' +
-        'f273ab082801a95506c4')
+        'f273ab082801a95506c4', 'hex')
 
-      var s2 = convert.hexToBytes(
+      var s2 = new Buffer(
         '045a1594316e433fb91f35ef4874610d22177c3f1a1060f6c1e70a609d51' +
         'b20be5795cd2a5eae0d6b872ba42db95e9afaeea3fbb89e98099575b6828' +
-        '609a978528')
+        '609a978528', 'hex')
 
       assert.ok(ecdsa.verify(hash2, sig_c, s2), 'Verify constant signature')
     })