diff --git a/src/common/Resampler.cpp b/src/common/Resampler.cpp
index c5b4970..7aaff71 100644
--- a/src/common/Resampler.cpp
+++ b/src/common/Resampler.cpp
@@ -77,7 +77,8 @@
 
 #define BQ_R__ R__
 
-using namespace std;
+using std::cerr;
+using std::endl;
 
 namespace RubberBand {
 
diff --git a/src/test/TestBinClassifier.cpp b/src/test/TestBinClassifier.cpp
index c233cc9..49db694 100644
--- a/src/test/TestBinClassifier.cpp
+++ b/src/test/TestBinClassifier.cpp
@@ -33,7 +33,10 @@
 #include "../common/sysutils.h"
 
 using namespace RubberBand;
-using namespace std;
+
+using std::vector;
+using std::string;
+
 namespace tt = boost::test_tools;
 
 // We use the symbols H, X, and _ for harmonic, percussive, and
diff --git a/src/test/TestResampler.cpp b/src/test/TestResampler.cpp
index b7b5bb3..1647f85 100644
--- a/src/test/TestResampler.cpp
+++ b/src/test/TestResampler.cpp
@@ -33,9 +33,13 @@
 #include <cmath>
 #include <iostream>
 
-using namespace std;
 using namespace RubberBand;
 
+using std::cerr;
+using std::endl;
+
+using std::vector;
+
 BOOST_AUTO_TEST_SUITE(TestResampler)
 
 #define LEN(a) (int(sizeof(a)/sizeof(a[0])))
diff --git a/src/test/TestSignalBits.cpp b/src/test/TestSignalBits.cpp
index 70c073f..07381f5 100644
--- a/src/test/TestSignalBits.cpp
+++ b/src/test/TestSignalBits.cpp
@@ -31,7 +31,9 @@
 #include "../finer/Peak.h"
 
 using namespace RubberBand;
-using namespace std;
+
+using std::vector;
+
 namespace tt = boost::test_tools;
 
 BOOST_AUTO_TEST_SUITE(TestSignalBits)
diff --git a/src/test/TestStretchCalculator.cpp b/src/test/TestStretchCalculator.cpp
index ae48056..6879032 100644
--- a/src/test/TestStretchCalculator.cpp
+++ b/src/test/TestStretchCalculator.cpp
@@ -31,7 +31,12 @@
 #include <iostream>
 
 using namespace RubberBand;
-using namespace std;
+
+using std::cerr;
+using std::endl;
+
+using std::vector;
+
 namespace tt = boost::test_tools;
 
 static Log cerrLog(
diff --git a/src/test/TestStretcher.cpp b/src/test/TestStretcher.cpp
index 271dfec..c68213f 100644
--- a/src/test/TestStretcher.cpp
+++ b/src/test/TestStretcher.cpp
@@ -33,7 +33,9 @@
 #include <cmath>
 
 using namespace RubberBand;
-using namespace std;
+
+using std::vector;
+
 namespace tt = boost::test_tools;
 
 BOOST_AUTO_TEST_SUITE(TestStretcher)
diff --git a/src/test/TestVectorOpsComplex.cpp b/src/test/TestVectorOpsComplex.cpp
index 0eebf5d..eea8223 100644
--- a/src/test/TestVectorOpsComplex.cpp
+++ b/src/test/TestVectorOpsComplex.cpp
@@ -35,8 +35,6 @@
 
 using namespace RubberBand;
 
-using namespace std;
-
 BOOST_AUTO_TEST_SUITE(TestVectorOpsComplex)
 
 #ifdef USE_APPROXIMATE_ATAN2