diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b4750ca6a4..99c840d532c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-07  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/libstdc++-dg/conformance.exp: Apply
+	check_v3_target_fileio as a gate for tests in
+	subdirectories matching the substring _filebuf.
+
 2010-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/locale_facets_nonio.tcc (time_get<>::
diff --git a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
index ae339496cda..8642eb7eea6 100644
--- a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
+++ b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
@@ -1,6 +1,6 @@
 # Functional and regression tests in C++ for libstdc++.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -83,10 +83,13 @@ if {[info exists tests_file] && [file exists $tests_file]} {
 	    # 2. performance tests.
 	    # 3. wchar_t tests, if not supported.
 	    # 4. thread tests, if not supported. 
+	    # 5. *_filebuf, if file I/O is not supported.
 	    if { [string first _xin $t] == -1
 		 && [string first performance $t] == -1
 		 && (${v3-wchar_t} || [string first wchar_t $t] == -1) 
-		 && (${v3-threads} || [string first thread $t] == -1) } {
+		 && (${v3-threads} || [string first thread $t] == -1)  
+		 && ([string first "_filebuf" $t] == -1
+		     || [check_v3_target_fileio]) } {
 		lappend tests $t
 	    }
 	}